Decompile cd000296a0

src/game/player.c

@@ -5557,7 +5557,7 @@ void player0f0c1840(struct coord *pos, struct coord *up, struct coord *look, str
 		bgFindRoomsByPos(pos, inrooms, aboverooms, 20, &bestroom);
 
 		if (inrooms[0] != -1) {
-			tmp = room = cd0002a400(pos, inrooms);
+			tmp = room = cdFindRoom(pos, inrooms);
 
 			if (room > 0) {
 				playerSetCamPropertiesWithRoom(pos, up, look, tmp);
@@ -5565,7 +5565,7 @@ void player0f0c1840(struct coord *pos, struct coord *up, struct coord *look, str
 				playerSetCamPropertiesWithRoom(pos, up, look, inrooms[0]);
 			}
 		} else if (aboverooms[0] != -1) {
-			tmp = room = cd0002a400(pos, aboverooms);
+			tmp = room = cdFindRoom(pos, aboverooms);
 
 			if (room > 0) {
 				playerSetCamPropertiesWithoutRoom(pos, up, look, tmp);

src/game/prop.c

@@ -7040,7 +7040,7 @@ void func0f065e98(struct coord *pos, s16 *rooms, struct coord *pos2, s16 *dstroo
 	}
 
 	if (ptr) {
-		s32 room = cd0002a400(pos2, ptr);
+		s32 room = cdFindRoom(pos2, ptr);
 
 		if (room > 0) {
 			dstrooms[0] = room;

src/game/propobj.c

@@ -19734,7 +19734,7 @@ glabel var7f1ab110jf
 /*  f077330:	ae0b0000 */ 	sw	$t3,0x0($s0)
 /*  f077334:	a7a9038e */ 	sh	$t1,0x38e($sp)
 /*  f077338:	27a405c8 */ 	addiu	$a0,$sp,0x5c8
-/*  f07733c:	0c00a7c4 */ 	jal	cd0002a400
+/*  f07733c:	0c00a7c4 */ 	jal	cdFindRoom
 /*  f077340:	27a505b8 */ 	addiu	$a1,$sp,0x5b8
 /*  f077344:	18400004 */ 	blez	$v0,.JF0f077358
 /*  f077348:	87a3038e */ 	lh	$v1,0x38e($sp)
@@ -23273,7 +23273,7 @@ glabel var7f1ab6dcpf
 /*  f076490:	ae0b0000 */ 	sw	$t3,0x0($s0)
 /*  f076494:	a7a9038e */ 	sh	$t1,0x38e($sp)
 /*  f076498:	27a405c8 */ 	addiu	$a0,$sp,0x5c8
-/*  f07649c:	0c00a740 */ 	jal	cd0002a400
+/*  f07649c:	0c00a740 */ 	jal	cdFindRoom
 /*  f0764a0:	27a505b8 */ 	addiu	$a1,$sp,0x5b8
 /*  f0764a4:	18400004 */ 	blez	$v0,.PF0f0764b8
 /*  f0764a8:	87a3038e */ 	lh	$v1,0x38e($sp)
@@ -26818,7 +26818,7 @@ glabel var7f1ab6dcpf
 /*  f0763e0:	ae0b0000 */ 	sw	$t3,0x0($s0)
 /*  f0763e4:	a7a9038e */ 	sh	$t1,0x38e($sp)
 /*  f0763e8:	27a405c8 */ 	addiu	$a0,$sp,0x5c8
-/*  f0763ec:	0c00aa70 */ 	jal	cd0002a400
+/*  f0763ec:	0c00aa70 */ 	jal	cdFindRoom
 /*  f0763f0:	27a505b8 */ 	addiu	$a1,$sp,0x5b8
 /*  f0763f4:	18400004 */ 	blez	$v0,.PB0f076408
 /*  f0763f8:	87a3038e */ 	lh	$v1,0x38e($sp)
@@ -30356,7 +30356,7 @@ glabel var7f1aa438
 /*  f07620c:	ae0b0000 */ 	sw	$t3,0x0($s0)
 /*  f076210:	a7a9038e */ 	sh	$t1,0x38e($sp)
 /*  f076214:	27a405c8 */ 	addiu	$a0,$sp,0x5c8
-/*  f076218:	0c00a900 */ 	jal	cd0002a400
+/*  f076218:	0c00a900 */ 	jal	cdFindRoom
 /*  f07621c:	27a505b8 */ 	addiu	$a1,$sp,0x5b8
 /*  f076220:	18400004 */ 	blez	$v0,.L0f076234
 /*  f076224:	87a3038e */ 	lh	$v1,0x38e($sp)

src/game/setupcover.c

@@ -76,7 +76,7 @@ void setupPrepareCover(void)
 				g_CoverRooms[i] = -1;
 
 				if (roomsptr != NULL) {
-					s32 room = cd0002a400(cover.pos, roomsptr);
+					s32 room = cdFindRoom(cover.pos, roomsptr);
 
 					if (room > 0) {
 						g_CoverRooms[i] = (s16)room;
@@ -102,7 +102,7 @@ void setupPrepareCover(void)
 					}
 
 					if (roomsptr) {
-						s32 aimroom = cd0002a400(&aimpos, roomsptr);
+						s32 aimroom = cdFindRoom(&aimpos, roomsptr);
 
 						if (aimroom > 0) {
 							g_CoverFlags[i] |= (g_CoverRooms[i] == (s16)aimroom) ? COVERFLAG_AIMSAMEROOM : COVERFLAG_AIMDIFFROOM;

src/game/setuppads.c

@@ -59,7 +59,7 @@ void setupPreparePads(void)
 			}
 
 			if (roomsptr != NULL) {
-				roomnum = cd0002a400(&pad.pos, roomsptr);
+				roomnum = cdFindRoom(&pad.pos, roomsptr);
 
 				if (roomnum > 0) {
 					packedpad->room = roomnum;

src/include/lib/collision.h

@@ -67,7 +67,7 @@ f32 cdFindGroundY(struct coord *pos, f32 radius, s16 *rooms, u16 *floorcol, u8 *
 f32 cd0002a324(void);
 f32 cdFindGroundYSimple(struct coord *pos, f32 width, s16 *rooms, u16 *floorcol, u8 *floortype);
 f32 cd0002a36c(struct coord *coord, s16 *rooms, u16 *floorcol, u8 *floortype);
-s32 cd0002a400(struct coord *pos, s16 *rooms);
+s32 cdFindRoom(struct coord *pos, s16 *nearrooms);
 
 #if VERSION >= VERSION_NTSC_1_0
 s16 cd0002a440(struct coord *pos, s16 *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr);

src/include/types.h

@@ -5774,7 +5774,7 @@ struct texturepair {
 
 struct collisionthing {
 	struct geo *geo;
-	u32 unk04;
+	bool intile;
 	s32 vertexindex;
 	struct prop *prop;
 	s32 room;