Rename positions to props

src/files/setup/setupcave.c

@@ -3636,7 +3636,7 @@ u8 func1003_intro[] = {
 	set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE)
 
 	wait_until(30, 0x6d)
-	speak(CHR_BOND, 0x0e37, 0x7447, CHANNEL_7, COLOR_09_BLUE) // "Agent Dark in position. I can see the main entranc..."
+	speak(CHR_BOND, 0x0e37, 0x7447, CHANNEL_7, COLOR_09_BLUE) // "Agent Dark in prop. I can see the main entranc..."
 
 	wait_until(312, 0x89)
 	play_sound(0x0594, CHANNEL_10)

src/files/setup/setuppete.c

@@ -2767,7 +2767,7 @@ u8 func040b_outro[] = {
 	endlist
 };
 
-u8 func1012_update_robot_position_flags[] = {
+u8 func1012_update_robot_prop_flags[] = {
 	// pad 0x00d4 = corner
 	// pad 0x00d9 = next to limo
 
@@ -3297,7 +3297,7 @@ struct ailist ailists[] = {
 	{ func100f_check_mine,                      0x100f },
 	{ func1010_elevator_switch,                 0x1010 },
 	{ func1011_trackerbug_coop,                 0x1011 },
-	{ func1012_update_robot_position_flags,     0x1012 },
+	{ func1012_update_robot_prop_flags,     0x1012 },
 	{ func1014_crash,                           0x1014 },
 	{ func040a_intro_sfx,                       0x1415 },
 	{ func1416_setup_rain,                      0x1416 },

src/files/setup/setuprit.c

@@ -1550,7 +1550,7 @@ u8 func0404_president_running[] = {
 	say_quip(CHR_BOND, 0x21, 0xff, 0x02, 0xff, BANK_1, 0x00, 0x00)
 	goto_first(0x58)
 
-	// Stopped because president is close to player's sampled position
+	// Stopped because president is close to player's sampled prop
 	label(0x5b)
 	goto_first(0x55)
 

src/game/chr/chrai.c

@@ -98,7 +98,7 @@ void chraiExecute(void *entity, s32 entity_type)
 			u32 animationmaybe = func0001d13c(g_Vars.chrdata->unk020);
 			if (g_Vars.chrdata->aishotlist >= 0
 					&& g_Vars.chrdata->cshield <= 0
-					&& (0 <= g_Vars.chrdata->damage || g_Vars.chrdata->gungroundpos != NULL)
+					&& (0 <= g_Vars.chrdata->damage || g_Vars.chrdata->gunprop != NULL)
 					&& animationmaybe != 0x269 && animationmaybe != 0x26b && animationmaybe != 0x26a) {
 				// Set shot list
 				g_Vars.chrdata->chrflags &= ~0x00200000;
@@ -180,13 +180,13 @@ u32 chraiGetCommandLength(u8 *ailist, u32 aioffset)
 	s32 type = (cmd[0] << 8) + cmd[1];
 
 	if (type == CMD_PRINT) {
-		u32 pos = aioffset + 2;
+		u32 prop = aioffset + 2;
 
-		while (ailist[pos] != 0) {
-			++pos;
+		while (ailist[prop] != 0) {
+			++prop;
 		}
 
-		return (pos - aioffset) + 1;
+		return (prop - aioffset) + 1;
 	}
 
 	if (type >= 0 && type < 0x1e1) {

src/game/game_0601b0.c

@@ -1507,7 +1507,7 @@ glabel func0f060db8
 /*  f0613c4:	02002025 */ 	or	$a0,$s0,$zero
 /*  f0613c8:	51e00013 */ 	beqzl	$t7,.L0f061418
 /*  f0613cc:	92020000 */ 	lbu	$v0,0x0($s0)
-/*  f0613d0:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0613d0:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0613d4:	afa306d8 */ 	sw	$v1,0x6d8($sp)
 /*  f0613d8:	3c0a800a */ 	lui	$t2,0x800a
 /*  f0613dc:	8d4aa24c */ 	lw	$t2,-0x5db4($t2)
@@ -2638,7 +2638,7 @@ glabel func0f062270
 /*  f062394:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f062398:	10800007 */ 	beqz	$a0,.L0f0623b8
 /*  f06239c:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f0623a0:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0623a0:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0623a4:	02602025 */ 	or	$a0,$s3,$zero
 /*  f0623a8:	3c0a800a */ 	lui	$t2,0x800a
 /*  f0623ac:	8d4aa24c */ 	lw	$t2,-0x5db4($t2)
@@ -5433,7 +5433,7 @@ glabel func0f064a24
 .L0f064b1c:
 /*  f064b1c:	56830057 */ 	bnel	$s4,$v1,.L0f064c7c
 /*  f064b20:	2673fc98 */ 	addiu	$s3,$s3,-872
-/*  f064b24:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f064b24:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f064b28:	02202025 */ 	or	$a0,$s1,$zero
 /*  f064b2c:	8e48028c */ 	lw	$t0,0x28c($s2)
 /*  f064b30:	50480052 */ 	beql	$v0,$t0,.L0f064c7c
@@ -5469,7 +5469,7 @@ glabel func0f064a24
 /*  f064ba4:	922f0000 */ 	lbu	$t7,0x0($s1)
 /*  f064ba8:	568f000a */ 	bnel	$s4,$t7,.L0f064bd4
 /*  f064bac:	8e420284 */ 	lw	$v0,0x284($s2)
-/*  f064bb0:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f064bb0:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f064bb4:	02202025 */ 	or	$a0,$s1,$zero
 /*  f064bb8:	0002c080 */ 	sll	$t8,$v0,0x2
 /*  f064bbc:	0258c821 */ 	addu	$t9,$s2,$t8
@@ -5925,7 +5925,7 @@ glabel func0f064ce8
 /*  f06522c:	8eb90284 */ 	lw	$t9,0x284($s5)
 /*  f065230:	5461003d */ 	bnel	$v1,$at,.L0f065328
 /*  f065234:	8eaa0348 */ 	lw	$t2,0x348($s5)
-/*  f065238:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f065238:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f06523c:	02202025 */ 	or	$a0,$s1,$zero
 /*  f065240:	8ead028c */ 	lw	$t5,0x28c($s5)
 /*  f065244:	504d0038 */ 	beql	$v0,$t5,.L0f065328
@@ -6193,7 +6193,7 @@ glabel func0f06554c
 /*  f0655ec:	10000068 */ 	beqz	$zero,.L0f065790
 /*  f0655f0:	00003025 */ 	or	$a2,$zero,$zero
 .L0f0655f4:
-/*  f0655f4:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0655f4:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0655f8:	afa6001c */ 	sw	$a2,0x1c($sp)
 /*  f0655fc:	3c04800a */ 	lui	$a0,%hi(g_Vars)
 /*  f065600:	24849fc0 */ 	addiu	$a0,$a0,%lo(g_Vars)

src/game/game_066310.c

@@ -8803,7 +8803,7 @@ glabel func0f06c8ac
 /*  f06cb20:	24010006 */ 	addiu	$at,$zero,0x6
 /*  f06cb24:	5441003a */ 	bnel	$v0,$at,.L0f06cc10
 /*  f06cb28:	92080000 */ 	lbu	$t0,0x0($s0)
-/*  f06cb2c:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f06cb2c:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f06cb30:	02002025 */ 	or	$a0,$s0,$zero
 /*  f06cb34:	00025080 */ 	sll	$t2,$v0,0x2
 /*  f06cb38:	026a5821 */ 	addu	$t3,$s3,$t2
@@ -8816,7 +8816,7 @@ glabel func0f06c8ac
 /*  f06cb50:	24010006 */ 	addiu	$at,$zero,0x6
 /*  f06cb54:	1441000e */ 	bne	$v0,$at,.L0f06cb90
 /*  f06cb58:	8e110004 */ 	lw	$s1,0x4($s0)
-/*  f06cb5c:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f06cb5c:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f06cb60:	02002025 */ 	or	$a0,$s0,$zero
 /*  f06cb64:	00027080 */ 	sll	$t6,$v0,0x2
 /*  f06cb68:	026e7821 */ 	addu	$t7,$s3,$t6
@@ -8867,7 +8867,7 @@ glabel func0f06c8ac
 /*  f06cc10:	24010006 */ 	addiu	$at,$zero,0x6
 /*  f06cc14:	55010015 */ 	bnel	$t0,$at,.L0f06cc6c
 /*  f06cc18:	86a20002 */ 	lh	$v0,0x2($s5)
-/*  f06cc1c:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f06cc1c:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f06cc20:	02002025 */ 	or	$a0,$s0,$zero
 /*  f06cc24:	00024880 */ 	sll	$t1,$v0,0x2
 /*  f06cc28:	02695021 */ 	addu	$t2,$s3,$t1
@@ -12323,7 +12323,7 @@ glabel func0f06f54c
 /*  f06fd30:	8c4400bc */ 	lw	$a0,0xbc($v0)
 /*  f06fd34:	5080000a */ 	beqzl	$a0,.L0f06fd60
 /*  f06fd38:	8da202a0 */ 	lw	$v0,0x2a0($t5)
-/*  f06fd3c:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f06fd3c:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f06fd40:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f06fd44:	3c058007 */ 	lui	$a1,%hi(var80069910)
 /*  f06fd48:	3c0d800a */ 	lui	$t5,%hi(g_Vars)
@@ -12338,7 +12338,7 @@ glabel func0f06f54c
 /*  f06fd68:	8c4400bc */ 	lw	$a0,0xbc($v0)
 /*  f06fd6c:	5080000a */ 	beqzl	$a0,.L0f06fd98
 /*  f06fd70:	8cb90000 */ 	lw	$t9,0x0($a1)
-/*  f06fd74:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f06fd74:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f06fd78:	afa30170 */ 	sw	$v1,0x170($sp)
 /*  f06fd7c:	8fa30170 */ 	lw	$v1,0x170($sp)
 /*  f06fd80:	24180001 */ 	addiu	$t8,$zero,0x1
@@ -16264,7 +16264,7 @@ glabel func0f073478
 /*  f073548:	00025040 */ 	sll	$t2,$v0,0x1
 .L0f07354c:
 /*  f07354c:	e7ac0094 */ 	swc1	$f12,0x94($sp)
-/*  f073550:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f073550:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f073554:	e7ae008c */ 	swc1	$f14,0x8c($sp)
 /*  f073558:	24480028 */ 	addiu	$t0,$v0,0x28
 /*  f07355c:	afa80010 */ 	sw	$t0,0x10($sp)
@@ -16547,7 +16547,7 @@ glabel func0f073478
 /*  f073970:	10000034 */ 	beqz	$zero,.L0f073a44
 /*  f073974:	a5000062 */ 	sh	$zero,0x62($t0)
 .L0f073978:
-/*  f073978:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f073978:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f07397c:	02802025 */ 	or	$a0,$s4,$zero
 /*  f073980:	8e09001c */ 	lw	$t1,0x1c($s0)
 /*  f073984:	14490029 */ 	bne	$v0,$t1,.L0f073a2c
@@ -18992,7 +18992,7 @@ glabel func0f073c6c
 /*  f075d2c:	2627005c */ 	addiu	$a3,$s1,0x5c
 /*  f075d30:	8f18a24c */ 	lw	$t8,-0x5db4($t8)
 /*  f075d34:	afa70070 */ 	sw	$a3,0x70($sp)
-/*  f075d38:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f075d38:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f075d3c:	afb80164 */ 	sw	$t8,0x164($sp)
 /*  f075d40:	0fc4a24b */ 	jal	setCurrentPlayerNum
 /*  f075d44:	00402025 */ 	or	$a0,$v0,$zero
@@ -19040,7 +19040,7 @@ glabel func0f073c6c
 /*  f075de0:	1441000e */ 	bne	$v0,$at,.L0f075e1c
 /*  f075de4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f075de8:	afa6015c */ 	sw	$a2,0x15c($sp)
-/*  f075dec:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f075dec:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f075df0:	afa70070 */ 	sw	$a3,0x70($sp)
 /*  f075df4:	00025880 */ 	sll	$t3,$v0,0x2
 /*  f075df8:	3c0f800a */ 	lui	$t7,0x800a
@@ -20936,7 +20936,7 @@ glabel func0f07766c
 .L0f077940:
 /*  f077940:	1441009e */ 	bne	$v0,$at,.L0f077bbc
 /*  f077944:	02202025 */ 	or	$a0,$s1,$zero
-/*  f077948:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f077948:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f07794c:	8fd40004 */ 	lw	$s4,0x4($s8)
 /*  f077950:	928e0003 */ 	lbu	$t6,0x3($s4)
 /*  f077954:	24010030 */ 	addiu	$at,$zero,0x30
@@ -22894,7 +22894,7 @@ glabel func0f078c78
 /*  f079554:	afa30044 */ 	sw	$v1,0x44($sp)
 /*  f079558:	afa800ac */ 	sw	$t0,0xac($sp)
 /*  f07955c:	e7a00048 */ 	swc1	$f0,0x48($sp)
-/*  f079560:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f079560:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f079564:	e7b200a4 */ 	swc1	$f18,0xa4($sp)
 /*  f079568:	3c09800a */ 	lui	$t1,%hi(g_Vars)
 /*  f07956c:	25299fc0 */ 	addiu	$t1,$t1,%lo(g_Vars)
@@ -24574,13 +24574,13 @@ glabel func0f07accc
 /*  f07adb4:	27bd00f8 */ 	addiu	$sp,$sp,0xf8
 );
 
-struct position *heliGetTargetPosition(struct heliobj *heli)
+struct prop *heliGetTargetProp(struct heliobj *heli)
 {
 	if (heli->target == -1) {
-		return g_Vars.currentplayer->targetpos;
+		return g_Vars.currentplayer->prop;
 	}
 
-	return g_Vars.positions + heli->target;
+	return g_Vars.props + heli->target;
 }
 
 GLOBAL_ASM(
@@ -24609,7 +24609,7 @@ glabel func0f07ae18
 /*  f07ae34:	c444007c */ 	lwc1	$f4,0x7c($v0)
 /*  f07ae38:	a3a00023 */ 	sb	$zero,0x23($sp)
 /*  f07ae3c:	afa20024 */ 	sw	$v0,0x24($sp)
-/*  f07ae40:	0fc1eb6e */ 	jal	heliGetTargetPosition
+/*  f07ae40:	0fc1eb6e */ 	jal	heliGetTargetProp
 /*  f07ae44:	e7a4001c */ 	swc1	$f4,0x1c($sp)
 /*  f07ae48:	8fa40024 */ 	lw	$a0,0x24($sp)
 /*  f07ae4c:	c4480008 */ 	lwc1	$f8,0x8($v0)
@@ -24686,7 +24686,7 @@ glabel func0f07af34
 /*  f07af44:	1040001d */ 	beqz	$v0,.L0f07afbc
 /*  f07af48:	00402025 */ 	or	$a0,$v0,$zero
 /*  f07af4c:	afa00020 */ 	sw	$zero,0x20($sp)
-/*  f07af50:	0fc1eb6e */ 	jal	heliGetTargetPosition
+/*  f07af50:	0fc1eb6e */ 	jal	heliGetTargetProp
 /*  f07af54:	afa20024 */ 	sw	$v0,0x24($sp)
 /*  f07af58:	904e0000 */ 	lbu	$t6,0x0($v0)
 /*  f07af5c:	24010006 */ 	addiu	$at,$zero,0x6
@@ -24944,7 +24944,7 @@ glabel heliFireRocket
 /*  f07b2a8:	00803025 */ 	or	$a2,$a0,$zero
 /*  f07b2ac:	51c0004c */ 	beqzl	$t6,.L0f07b3e0
 /*  f07b2b0:	8fbf0024 */ 	lw	$ra,0x24($sp)
-/*  f07b2b4:	0fc1eb6e */ 	jal	heliGetTargetPosition
+/*  f07b2b4:	0fc1eb6e */ 	jal	heliGetTargetProp
 /*  f07b2b8:	afa600d0 */ 	sw	$a2,0xd0($sp)
 /*  f07b2bc:	8faf00d4 */ 	lw	$t7,0xd4($sp)
 /*  f07b2c0:	8fa600d0 */ 	lw	$a2,0xd0($sp)
@@ -25054,7 +25054,7 @@ glabel func0f07b3f0
 /*  f07b444:	c44400cc */ 	lwc1	$f4,0xcc($v0)
 /*  f07b448:	e7b00110 */ 	swc1	$f16,0x110($sp)
 /*  f07b44c:	e7b0010c */ 	swc1	$f16,0x10c($sp)
-/*  f07b450:	0fc1eb6e */ 	jal	heliGetTargetPosition
+/*  f07b450:	0fc1eb6e */ 	jal	heliGetTargetProp
 /*  f07b454:	e7a400e0 */ 	swc1	$f4,0xe0($sp)
 /*  f07b458:	afa200dc */ 	sw	$v0,0xdc($sp)
 /*  f07b45c:	afa000d4 */ 	sw	$zero,0xd4($sp)
@@ -26615,7 +26615,7 @@ glabel func0f07cacc
 /*  f07caf4:	afa40170 */ 	sw	$a0,0x170($sp)
 /*  f07caf8:	8c930004 */ 	lw	$s3,0x4($a0)
 /*  f07cafc:	afb30168 */ 	sw	$s3,0x168($sp)
-/*  f07cb00:	0fc1eb6e */ 	jal	heliGetTargetPosition
+/*  f07cb00:	0fc1eb6e */ 	jal	heliGetTargetProp
 /*  f07cb04:	02602025 */ 	or	$a0,$s3,$zero
 /*  f07cb08:	8fa50170 */ 	lw	$a1,0x170($sp)
 /*  f07cb0c:	afa2015c */ 	sw	$v0,0x15c($sp)
@@ -28766,7 +28766,7 @@ glabel func0f07e758
 /*  f07e988:	8c640088 */ 	lw	$a0,0x88($v1)
 /*  f07e98c:	5080000e */ 	beqzl	$a0,.L0f07e9c8
 /*  f07e990:	8fa90254 */ 	lw	$t1,0x254($sp)
-/*  f07e994:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f07e994:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f07e998:	afa3021c */ 	sw	$v1,0x21c($sp)
 /*  f07e99c:	3c07800a */ 	lui	$a3,%hi(g_Vars)
 /*  f07e9a0:	24e79fc0 */ 	addiu	$a3,$a3,%lo(g_Vars)
@@ -29791,7 +29791,7 @@ glabel func0f07f6d0
 /*  f07f854:	8e490004 */ 	lw	$t1,0x4($s2)
 /*  f07f858:	51200020 */ 	beqzl	$t1,.L0f07f8dc
 /*  f07f85c:	8e520020 */ 	lw	$s2,0x20($s2)
-/*  f07f860:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f07f860:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f07f864:	02402025 */ 	or	$a0,$s2,$zero
 /*  f07f868:	8eaa028c */ 	lw	$t2,0x28c($s5)
 /*  f07f86c:	504a001b */ 	beql	$v0,$t2,.L0f07f8dc
@@ -43004,7 +43004,7 @@ glabel func0f08b27c
 /*  f08b2b0:	afa20094 */ 	sw	$v0,0x94($sp)
 .L0f08b2b4:
 /*  f08b2b4:	8faf00b0 */ 	lw	$t7,0xb0($sp)
-/*  f08b2b8:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f08b2b8:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f08b2bc:	8de4001c */ 	lw	$a0,0x1c($t7)
 /*  f08b2c0:	afa20094 */ 	sw	$v0,0x94($sp)
 .L0f08b2c4:
@@ -43155,7 +43155,7 @@ glabel func0f08b27c
 /*  f08b4ec:	55e10023 */ 	bnel	$t7,$at,.L0f08b57c
 /*  f08b4f0:	a20a00a9 */ 	sb	$t2,0xa9($s0)
 /*  f08b4f4:	8d08a24c */ 	lw	$t0,-0x5db4($t0)
-/*  f08b4f8:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f08b4f8:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f08b4fc:	afa80030 */ 	sw	$t0,0x30($sp)
 /*  f08b500:	0fc4a24b */ 	jal	setCurrentPlayerNum
 /*  f08b504:	00402025 */ 	or	$a0,$v0,$zero
@@ -47581,7 +47581,7 @@ glabel func0f08f11c
 /*  f08f2c0:	5040000e */ 	beqzl	$v0,.L0f08f2fc
 /*  f08f2c4:	822a0007 */ 	lb	$t2,0x7($s1)
 .L0f08f2c8:
-/*  f08f2c8:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f08f2c8:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f08f2cc:	02202025 */ 	or	$a0,$s1,$zero
 /*  f08f2d0:	02202025 */ 	or	$a0,$s1,$zero
 /*  f08f2d4:	24450008 */ 	addiu	$a1,$v0,0x8
@@ -53129,7 +53129,7 @@ glabel func0f0939f8
 );
 
 GLOBAL_ASM(
-glabel audioPlayFromWorldPosition
+glabel audioPlayFromProp
 /*  f094040:	27bdffa0 */ 	addiu	$sp,$sp,-96
 /*  f094044:	87ae0072 */ 	lh	$t6,0x72($sp)
 /*  f094048:	afb00048 */ 	sw	$s0,0x48($sp)
@@ -53447,7 +53447,7 @@ glabel audioIfChannelIdle
 );
 
 GLOBAL_ASM(
-glabel audioPlayFromWorldPosition2
+glabel audioPlayFromProp2
 /*  f094494:	27bdffa8 */ 	addiu	$sp,$sp,-88
 /*  f094498:	8fb90068 */ 	lw	$t9,0x68($sp)
 /*  f09449c:	3c0a8007 */ 	lui	$t2,%hi(var8006ae10)

src/game/game_097a50.c

@@ -9222,7 +9222,7 @@ glabel func0f09ee18
 /*  f09f044:	10000004 */ 	beqz	$zero,.L0f09f058
 /*  f09f048:	8e0f0040 */ 	lw	$t7,0x40($s0)
 .L0f09f04c:
-/*  f09f04c:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f09f04c:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f09f050:	8dc4001c */ 	lw	$a0,0x1c($t6)
 /*  f09f054:	8e0f0040 */ 	lw	$t7,0x40($s0)
 .L0f09f058:

src/game/game_0b28d0.c

@@ -10220,7 +10220,7 @@ glabel func0f0bb42c
 
 void func0f0bb57c(f32 arg0, f32 arg1)
 {
-	struct chrdata *chr = g_Vars.currentplayer->targetpos->chr;
+	struct chrdata *chr = g_Vars.currentplayer->prop->chr;
 
 	if (chr) {
 		g_Vars.currentplayer->unk0188 = 0;
@@ -17539,7 +17539,7 @@ glabel func0f0c1e54
 /*  f0c1e54:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*  f0c1e58:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f0c1e5c:	afa40020 */ 	sw	$a0,0x20($sp)
-/*  f0c1e60:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c1e60:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c1e64:	afa50024 */ 	sw	$a1,0x24($sp)
 /*  f0c1e68:	00027080 */ 	sll	$t6,$v0,0x2
 /*  f0c1e6c:	3c0f800a */ 	lui	$t7,0x800a
@@ -17592,7 +17592,7 @@ glabel func0f0c1f08
 /*  f0c1f08:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f0c1f0c:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f0c1f10:	afa60020 */ 	sw	$a2,0x20($sp)
-/*  f0c1f14:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c1f14:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c1f18:	afa5001c */ 	sw	$a1,0x1c($sp)
 /*  f0c1f1c:	3c06800a */ 	lui	$a2,%hi(g_Vars)
 /*  f0c1f20:	24c69fc0 */ 	addiu	$a2,$a2,%lo(g_Vars)
@@ -17715,7 +17715,7 @@ glabel func0f0c20b8
 /*  f0c20bc:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f0c20c0:	afa5001c */ 	sw	$a1,0x1c($sp)
 /*  f0c20c4:	afa70024 */ 	sw	$a3,0x24($sp)
-/*  f0c20c8:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c20c8:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c20cc:	afa60020 */ 	sw	$a2,0x20($sp)
 /*  f0c20d0:	3c04800a */ 	lui	$a0,%hi(g_Vars)
 /*  f0c20d4:	24849fc0 */ 	addiu	$a0,$a0,%lo(g_Vars)
@@ -17855,7 +17855,7 @@ GLOBAL_ASM(
 glabel func0f0c228c
 /*  f0c228c:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*  f0c2290:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f0c2294:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c2294:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c2298:	afa40020 */ 	sw	$a0,0x20($sp)
 /*  f0c229c:	00027080 */ 	sll	$t6,$v0,0x2
 /*  f0c22a0:	3c04800a */ 	lui	$a0,%hi(var800a0814)
@@ -17863,7 +17863,7 @@ glabel func0f0c228c
 /*  f0c22a8:	8c84a024 */ 	lw	$a0,-0x5fdc($a0)
 /*  f0c22ac:	0fc2b6ef */ 	jal	func0f0adbbc
 /*  f0c22b0:	24840814 */ 	addiu	$a0,$a0,%lo(var800a0814)
-/*  f0c22b4:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c22b4:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c22b8:	8fa40020 */ 	lw	$a0,0x20($sp)
 /*  f0c22bc:	00027880 */ 	sll	$t7,$v0,0x2
 /*  f0c22c0:	3c04800a */ 	lui	$a0,%hi(var800a0fb8)
@@ -17919,7 +17919,7 @@ glabel func0f0c2364
 /*  f0c236c:	afb20030 */ 	sw	$s2,0x30($sp)
 /*  f0c2370:	afb1002c */ 	sw	$s1,0x2c($sp)
 /*  f0c2374:	afb00028 */ 	sw	$s0,0x28($sp)
-/*  f0c2378:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c2378:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c237c:	afa40100 */ 	sw	$a0,0x100($sp)
 /*  f0c2380:	3c12800a */ 	lui	$s2,%hi(g_Vars)
 /*  f0c2384:	26529fc0 */ 	addiu	$s2,$s2,%lo(g_Vars)
@@ -18499,7 +18499,7 @@ glabel func0f0c2a58
 /*  f0c2bc4:	afa3005c */ 	sw	$v1,0x5c($sp)
 /*  f0c2bc8:	afa50058 */ 	sw	$a1,0x58($sp)
 /*  f0c2bcc:	afa60054 */ 	sw	$a2,0x54($sp)
-/*  f0c2bd0:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c2bd0:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c2bd4:	e7a20030 */ 	swc1	$f2,0x30($sp)
 /*  f0c2bd8:	00027080 */ 	sll	$t6,$v0,0x2
 /*  f0c2bdc:	3c0f800a */ 	lui	$t7,0x800a
@@ -18750,7 +18750,7 @@ glabel func0f0c2a58
 /*  f0c2f4c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0c2f50:	afa50038 */ 	sw	$a1,0x38($sp)
 /*  f0c2f54:	e7ac0024 */ 	swc1	$f12,0x24($sp)
-/*  f0c2f58:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c2f58:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c2f5c:	e7b00020 */ 	swc1	$f16,0x20($sp)
 /*  f0c2f60:	00024880 */ 	sll	$t1,$v0,0x2
 /*  f0c2f64:	3c0a800a */ 	lui	$t2,0x800a
@@ -18990,7 +18990,7 @@ glabel func0f0c32a0
 /*  f0c32a4:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f0c32a8:	afa40018 */ 	sw	$a0,0x18($sp)
 /*  f0c32ac:	afa5001c */ 	sw	$a1,0x1c($sp)
-/*  f0c32b0:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c32b0:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c32b4:	afa60020 */ 	sw	$a2,0x20($sp)
 /*  f0c32b8:	00027080 */ 	sll	$t6,$v0,0x2
 /*  f0c32bc:	3c0f800a */ 	lui	$t7,0x800a

src/game/game_0c37d0.c

@@ -2393,7 +2393,7 @@ glabel func0f0c4fd8
 /*  f0c598c:	8e0d028c */ 	lw	$t5,0x28c($s0)
 /*  f0c5990:	00e02025 */ 	or	$a0,$a3,$zero
 /*  f0c5994:	afa30104 */ 	sw	$v1,0x104($sp)
-/*  f0c5998:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0c5998:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0c599c:	afad007c */ 	sw	$t5,0x7c($sp)
 /*  f0c59a0:	0fc4a24b */ 	jal	setCurrentPlayerNum
 /*  f0c59a4:	00402025 */ 	or	$a0,$v0,$zero

src/game/game_0c79f0.c

@@ -4559,7 +4559,7 @@ glabel func0f0cb79c
 /*  f0cb7a8:	afa40050 */ 	sw	$a0,0x50($sp)
 /*  f0cb7ac:	afa60058 */ 	sw	$a2,0x58($sp)
 /*  f0cb7b0:	00a08025 */ 	or	$s0,$a1,$zero
-/*  f0cb7b4:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0cb7b4:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0cb7b8:	8c8400bc */ 	lw	$a0,0xbc($a0)
 /*  f0cb7bc:	00027880 */ 	sll	$t7,$v0,0x2
 /*  f0cb7c0:	3c18800a */ 	lui	$t8,0x800a
@@ -4568,7 +4568,7 @@ glabel func0f0cb79c
 /*  f0cb7cc:	8fb90050 */ 	lw	$t9,0x50($sp)
 /*  f0cb7d0:	c70c19c4 */ 	lwc1	$f12,0x19c4($t8)
 /*  f0cb7d4:	8f2400bc */ 	lw	$a0,0xbc($t9)
-/*  f0cb7d8:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0cb7d8:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0cb7dc:	e7ac0034 */ 	swc1	$f12,0x34($sp)
 /*  f0cb7e0:	3c014248 */ 	lui	$at,0x4248
 /*  f0cb7e4:	44810000 */ 	mtc1	$at,$f0

src/game/game_0cf150.c

@@ -426,7 +426,7 @@ glabel func0f0cf38c
 /*  f0cf6a0:	5581000b */ 	bnel	$t4,$at,.L0f0cf6d0
 /*  f0cf6a4:	02002025 */ 	or	$a0,$s0,$zero
 /*  f0cf6a8:	8dada24c */ 	lw	$t5,-0x5db4($t5)
-/*  f0cf6ac:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f0cf6ac:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f0cf6b0:	afad004c */ 	sw	$t5,0x4c($sp)
 /*  f0cf6b4:	8fae004c */ 	lw	$t6,0x4c($sp)
 /*  f0cf6b8:	240f0001 */ 	addiu	$t7,$zero,0x1

src/game/game_11ecf0.c

@@ -10681,7 +10681,7 @@ void setCurrentPlayerNum(u32 playernum)
 }
 
 GLOBAL_ASM(
-glabel posGetPlayerNum
+glabel propGetPlayerNum
 /*  f12897c:	3c0a800a */ 	lui	$t2,%hi(g_Vars)
 /*  f128980:	254a9fc0 */ 	addiu	$t2,$t2,%lo(g_Vars)
 /*  f128984:	8d42006c */ 	lw	$v0,0x6c($t2)

src/game/game_129900.c

@@ -1159,7 +1159,7 @@ glabel func0f129cfc
 /*  f129d9c:	8f190020 */ 	lw	$t9,0x20($t8)
 /*  f129da0:	5320002b */ 	beqzl	$t9,.L0f129e50
 /*  f129da4:	8eb90000 */ 	lw	$t9,0x0($s5)
-/*  f129da8:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f129da8:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f129dac:	02022021 */ 	addu	$a0,$s0,$v0
 /*  f129db0:	8ec80284 */ 	lw	$t0,0x284($s6)
 /*  f129db4:	8d0900bc */ 	lw	$t1,0xbc($t0)
@@ -23804,7 +23804,7 @@ glabel func0f13e4a8
 /*  f13e4d4:	24010006 */ 	addiu	$at,$zero,0x6
 /*  f13e4d8:	15e10008 */ 	bne	$t7,$at,.L0f13e4fc
 /*  f13e4dc:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f13e4e0:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f13e4e0:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f13e4e4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f13e4e8:	0fc4a24b */ 	jal	setCurrentPlayerNum
 /*  f13e4ec:	00402025 */ 	or	$a0,$v0,$zero

src/game/game_1668e0.c

@@ -2572,7 +2572,7 @@ glabel func0f1688fc
 /*  f168940:	8c3977e0 */ 	lw	$t9,%lo(var7f1b77e0)($at)
 /*  f168944:	03200008 */ 	jr	$t9
 /*  f168948:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f16894c:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f16894c:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f168950:	00c02025 */ 	or	$a0,$a2,$zero
 /*  f168954:	3c0a800a */ 	lui	$t2,0x800a
 /*  f168958:	8d4aa24c */ 	lw	$t2,-0x5db4($t2)
@@ -3046,7 +3046,7 @@ glabel func0f168f24
 /*  f168ff8:	24010006 */ 	addiu	$at,$zero,0x6
 /*  f168ffc:	1441000b */ 	bne	$v0,$at,.L0f16902c
 /*  f169000:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f169004:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f169004:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f169008:	02402025 */ 	or	$a0,$s2,$zero
 /*  f16900c:	8e69028c */ 	lw	$t1,0x28c($s3)
 /*  f169010:	10490006 */ 	beq	$v0,$t1,.L0f16902c

src/game/game_187770.c

@@ -11685,7 +11685,7 @@ glabel func0f1915b4
 /*  f1915cc:	10000008 */ 	beqz	$zero,.L0f1915f0
 /*  f1915d0:	8c620020 */ 	lw	$v0,0x20($v1)
 .L0f1915d4:
-/*  f1915d4:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f1915d4:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f1915d8:	8ca4001c */ 	lw	$a0,0x1c($a1)
 /*  f1915dc:	00027080 */ 	sll	$t6,$v0,0x2
 /*  f1915e0:	3c0f800a */ 	lui	$t7,0x800a
@@ -11703,7 +11703,7 @@ GLOBAL_ASM(
 glabel func0f191600
 /*  f191600:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f191604:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f191608:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f191608:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f19160c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f191610:	10400004 */ 	beqz	$v0,.L0f191624
 /*  f191614:	00001825 */ 	or	$v1,$zero,$zero
@@ -11729,7 +11729,7 @@ glabel func0f191638
 /*  f191650:	51c1009b */ 	beql	$t6,$at,.L0f1918c0
 /*  f191654:	8fbf0014 */ 	lw	$ra,0x14($sp)
 /*  f191658:	afa40030 */ 	sw	$a0,0x30($sp)
-/*  f19165c:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f19165c:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f191660:	afa0002c */ 	sw	$zero,0x2c($sp)
 /*  f191664:	afa20028 */ 	sw	$v0,0x28($sp)
 /*  f191668:	0fc633fe */ 	jal	func0f18cff8
@@ -12010,7 +12010,7 @@ glabel func0f1918d0
 /*  f191a48:	00002825 */ 	or	$a1,$zero,$zero
 /*  f191a4c:	5040000c */ 	beqzl	$v0,.L0f191a80
 /*  f191a50:	922402a0 */ 	lbu	$a0,0x2a0($s1)
-/*  f191a54:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f191a54:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f191a58:	02202025 */ 	or	$a0,$s1,$zero
 /*  f191a5c:	02202025 */ 	or	$a0,$s1,$zero
 /*  f191a60:	0fc122a1 */ 	jal	func0f048a84
@@ -13130,7 +13130,7 @@ glabel func0f19294c
 /*  f1929c8:	5161000e */ 	beql	$t3,$at,.L0f192a04
 /*  f1929cc:	8c8e02d4 */ 	lw	$t6,0x2d4($a0)
 /*  f1929d0:	afa40018 */ 	sw	$a0,0x18($sp)
-/*  f1929d4:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f1929d4:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f1929d8:	afa5001c */ 	sw	$a1,0x1c($sp)
 /*  f1929dc:	8fa5001c */ 	lw	$a1,0x1c($sp)
 /*  f1929e0:	8fa40018 */ 	lw	$a0,0x18($sp)
@@ -13311,7 +13311,7 @@ glabel func0f192a74
 /*  f192c40:	afa3003c */ 	sw	$v1,0x3c($sp)
 /*  f192c44:	afa6001c */ 	sw	$a2,0x1c($sp)
 /*  f192c48:	e7ae002c */ 	swc1	$f14,0x2c($sp)
-/*  f192c4c:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f192c4c:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f192c50:	e7b00030 */ 	swc1	$f16,0x30($sp)
 /*  f192c54:	8c4b0004 */ 	lw	$t3,0x4($v0)
 /*  f192c58:	3c05800a */ 	lui	$a1,%hi(g_Vars)
@@ -13687,7 +13687,7 @@ glabel func0f192e90
 /*  f19317c:	2411ffff */ 	addiu	$s1,$zero,-1
 /*  f193180:	52380028 */ 	beql	$s1,$t8,.L0f193224
 /*  f193184:	86a2017e */ 	lh	$v0,0x17e($s5)
-/*  f193188:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f193188:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f19318c:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f193190:	00408025 */ 	or	$s0,$v0,$zero
 /*  f193194:	0fc0e6a5 */ 	jal	chrIsDead
@@ -16277,7 +16277,7 @@ glabel func0f194b40
 /*  f19558c:	02802025 */ 	or	$a0,$s4,$zero
 /*  f195590:	13200007 */ 	beqz	$t9,.L0f1955b0
 /*  f195594:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f195598:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f195598:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f19559c:	2415002f */ 	addiu	$s5,$zero,0x2f
 /*  f1955a0:	0fc633fe */ 	jal	func0f18cff8
 /*  f1955a4:	8c440004 */ 	lw	$a0,0x4($v0)
@@ -16616,14 +16616,14 @@ glabel func0f194b40
 /*  f195a60:	8e4d0128 */ 	lw	$t5,0x128($s2)
 /*  f195a64:	11a00010 */ 	beqz	$t5,.L0f195aa8
 /*  f195a68:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f195a6c:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f195a6c:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f195a70:	02802025 */ 	or	$a0,$s4,$zero
 /*  f195a74:	02802025 */ 	or	$a0,$s4,$zero
 /*  f195a78:	0fc64b70 */ 	jal	func0f192dc0
 /*  f195a7c:	8c450004 */ 	lw	$a1,0x4($v0)
 /*  f195a80:	10400009 */ 	beqz	$v0,.L0f195aa8
 /*  f195a84:	02802025 */ 	or	$a0,$s4,$zero
-/*  f195a88:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f195a88:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f195a8c:	2415002f */ 	addiu	$s5,$zero,0x2f
 /*  f195a90:	0fc633fe */ 	jal	func0f18cff8
 /*  f195a94:	8c440004 */ 	lw	$a0,0x4($v0)
@@ -17179,7 +17179,7 @@ glabel func0f194b40
 /*  f1962c0:	1000000b */ 	beqz	$zero,.L0f1962f0
 /*  f1962c4:	46049001 */ 	sub.s	$f0,$f18,$f4
 .L0f1962c8:
-/*  f1962c8:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f1962c8:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f1962cc:	8ca4001c */ 	lw	$a0,0x1c($a1)
 /*  f1962d0:	00026880 */ 	sll	$t5,$v0,0x2
 /*  f1962d4:	02cd5821 */ 	addu	$t3,$s6,$t5
@@ -17218,7 +17218,7 @@ glabel func0f194b40
 /*  f196340:	8698017e */ 	lh	$t8,0x17e($s4)
 /*  f196344:	13d8000a */ 	beq	$s8,$t8,.L0f196370
 /*  f196348:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f19634c:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f19634c:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f196350:	02802025 */ 	or	$a0,$s4,$zero
 /*  f196354:	02802025 */ 	or	$a0,$s4,$zero
 /*  f196358:	0fc64b70 */ 	jal	func0f192dc0
@@ -17446,13 +17446,13 @@ glabel func0f194b40
 /*  f19667c:	868f017e */ 	lh	$t7,0x17e($s4)
 /*  f196680:	53cf000e */ 	beql	$s8,$t7,.L0f1966bc
 /*  f196684:	24190029 */ 	addiu	$t9,$zero,0x29
-/*  f196688:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f196688:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f19668c:	02802025 */ 	or	$a0,$s4,$zero
 /*  f196690:	0fc0e6a5 */ 	jal	chrIsDead
 /*  f196694:	8c440004 */ 	lw	$a0,0x4($v0)
 /*  f196698:	54400008 */ 	bnezl	$v0,.L0f1966bc
 /*  f19669c:	24190029 */ 	addiu	$t9,$zero,0x29
-/*  f1966a0:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f1966a0:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f1966a4:	02802025 */ 	or	$a0,$s4,$zero
 /*  f1966a8:	02802025 */ 	or	$a0,$s4,$zero
 /*  f1966ac:	0fc64b70 */ 	jal	func0f192dc0
@@ -17511,7 +17511,7 @@ glabel func0f194b40
 /*  f196768:	8e490128 */ 	lw	$t1,0x128($s2)
 /*  f19676c:	11200031 */ 	beqz	$t1,.L0f196834
 /*  f196770:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f196774:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f196774:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f196778:	02802025 */ 	or	$a0,$s4,$zero
 /*  f19677c:	02802025 */ 	or	$a0,$s4,$zero
 /*  f196780:	0fc64b70 */ 	jal	func0f192dc0
@@ -17553,7 +17553,7 @@ glabel func0f194b40
 /*  f196808:	02802025 */ 	or	$a0,$s4,$zero
 /*  f19680c:	45000009 */ 	bc1f	.L0f196834
 /*  f196810:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f196814:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f196814:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f196818:	a28e02a0 */ 	sb	$t6,0x2a0($s4)
 /*  f19681c:	0fc633fe */ 	jal	func0f18cff8
 /*  f196820:	8c440004 */ 	lw	$a0,0x4($v0)
@@ -17647,7 +17647,7 @@ glabel func0f194b40
 /*  f196960:	8e580128 */ 	lw	$t8,0x128($s2)
 /*  f196964:	53000012 */ 	beqzl	$t8,.L0f1969b0
 /*  f196968:	8e4900dc */ 	lw	$t1,0xdc($s2)
-/*  f19696c:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f19696c:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f196970:	02802025 */ 	or	$a0,$s4,$zero
 /*  f196974:	02802025 */ 	or	$a0,$s4,$zero
 /*  f196978:	0fc64b70 */ 	jal	func0f192dc0
@@ -17655,7 +17655,7 @@ glabel func0f194b40
 /*  f196980:	1040000a */ 	beqz	$v0,.L0f1969ac
 /*  f196984:	240f002f */ 	addiu	$t7,$zero,0x2f
 /*  f196988:	a28f02a0 */ 	sb	$t7,0x2a0($s4)
-/*  f19698c:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f19698c:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f196990:	02802025 */ 	or	$a0,$s4,$zero
 /*  f196994:	0fc633fe */ 	jal	func0f18cff8
 /*  f196998:	8c440004 */ 	lw	$a0,0x4($v0)
@@ -17822,7 +17822,7 @@ glabel func0f194b40
 /*  f196bd4:	868d017e */ 	lh	$t5,0x17e($s4)
 /*  f196bd8:	13cd0021 */ 	beq	$s8,$t5,.L0f196c60
 /*  f196bdc:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f196be0:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f196be0:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f196be4:	02802025 */ 	or	$a0,$s4,$zero
 /*  f196be8:	8e83001c */ 	lw	$v1,0x1c($s4)
 /*  f196bec:	00408025 */ 	or	$s0,$v0,$zero
@@ -18313,7 +18313,7 @@ glabel func0f194b40
 /*  f1972f8:	10400021 */ 	beqz	$v0,.L0f197380
 /*  f1972fc:	00000000 */ 	sll	$zero,$zero,0x0
 .L0f197300:
-/*  f197300:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f197300:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f197304:	02802025 */ 	or	$a0,$s4,$zero
 /*  f197308:	0fc0e6a5 */ 	jal	chrIsDead
 /*  f19730c:	8c440004 */ 	lw	$a0,0x4($v0)

src/game/game_197600.c

@@ -133,7 +133,7 @@ glabel func0f197600
 /*  f1976dc:	afa60060 */ 	sw	$a2,0x60($sp)
 /*  f1976e0:	afa7004c */ 	sw	$a3,0x4c($sp)
 /*  f1976e4:	afa80054 */ 	sw	$t0,0x54($sp)
-/*  f1976e8:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f1976e8:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f1976ec:	afa90048 */ 	sw	$t1,0x48($sp)
 /*  f1976f0:	8fa7004c */ 	lw	$a3,0x4c($sp)
 /*  f1976f4:	c4460008 */ 	lwc1	$f6,0x8($v0)
@@ -192,7 +192,7 @@ glabel func0f197600
 /*  f1977c0:	11810008 */ 	beq	$t4,$at,.L0f1977e4
 /*  f1977c4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f1977c8:	afa60060 */ 	sw	$a2,0x60($sp)
-/*  f1977cc:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f1977cc:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f1977d0:	afa80054 */ 	sw	$t0,0x54($sp)
 /*  f1977d4:	8fa80054 */ 	lw	$t0,0x54($sp)
 /*  f1977d8:	8fa60060 */ 	lw	$a2,0x60($sp)
@@ -1421,7 +1421,7 @@ glabel func0f198338
 /*  f198858:	11810014 */ 	beq	$t4,$at,.L0f1988ac
 /*  f19885c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f198860:	afa8004c */ 	sw	$t0,0x4c($sp)
-/*  f198864:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f198864:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f198868:	afaa0048 */ 	sw	$t2,0x48($sp)
 /*  f19886c:	0fc633fe */ 	jal	func0f18cff8
 /*  f198870:	8c440004 */ 	lw	$a0,0x4($v0)
@@ -1462,7 +1462,7 @@ glabel func0f198338
 /*  f1988f0:	53210016 */ 	beql	$t9,$at,.L0f19894c
 /*  f1988f4:	2508fff1 */ 	addiu	$t0,$t0,-15
 /*  f1988f8:	afa8004c */ 	sw	$t0,0x4c($sp)
-/*  f1988fc:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f1988fc:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f198900:	afaa0048 */ 	sw	$t2,0x48($sp)
 /*  f198904:	0fc633fe */ 	jal	func0f18cff8
 /*  f198908:	8c440004 */ 	lw	$a0,0x4($v0)
@@ -1519,7 +1519,7 @@ glabel func0f198338
 /*  f1989c4:	2401ffff */ 	addiu	$at,$zero,-1
 /*  f1989c8:	51e1000c */ 	beql	$t7,$at,.L0f1989fc
 /*  f1989cc:	24080031 */ 	addiu	$t0,$zero,0x31
-/*  f1989d0:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f1989d0:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f1989d4:	03202025 */ 	or	$a0,$t9,$zero
 /*  f1989d8:	8c4b0004 */ 	lw	$t3,0x4($v0)
 /*  f1989dc:	00004025 */ 	or	$t0,$zero,$zero
@@ -1544,7 +1544,7 @@ glabel func0f198338
 /*  f198a20:	13010008 */ 	beq	$t8,$at,.L0f198a44
 /*  f198a24:	01c02025 */ 	or	$a0,$t6,$zero
 /*  f198a28:	afa8004c */ 	sw	$t0,0x4c($sp)
-/*  f198a2c:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f198a2c:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f198a30:	afaa0048 */ 	sw	$t2,0x48($sp)
 /*  f198a34:	8c4f0004 */ 	lw	$t7,0x4($v0)
 /*  f198a38:	8fa8004c */ 	lw	$t0,0x4c($sp)
@@ -2210,7 +2210,7 @@ glabel func0f198eec
 /*  f199378:	2401ffff */ 	addiu	$at,$zero,-1
 /*  f19937c:	51a10022 */ 	beql	$t5,$at,.L0f199408
 /*  f199380:	8fa40090 */ 	lw	$a0,0x90($sp)
-/*  f199384:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f199384:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f199388:	01802025 */ 	or	$a0,$t4,$zero
 /*  f19938c:	0fc633fe */ 	jal	func0f18cff8
 /*  f199390:	8c440004 */ 	lw	$a0,0x4($v0)
@@ -2225,7 +2225,7 @@ glabel func0f198eec
 /*  f1993b4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f1993b8:	45020013 */ 	bc1fl	.L0f199408
 /*  f1993bc:	8fa40090 */ 	lw	$a0,0x90($sp)
-/*  f1993c0:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f1993c0:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f1993c4:	01c02025 */ 	or	$a0,$t6,$zero
 /*  f1993c8:	0fc633fe */ 	jal	func0f18cff8
 /*  f1993cc:	8c440004 */ 	lw	$a0,0x4($v0)

src/game/game_1999b0.c

@@ -603,7 +603,7 @@ glabel func0f199f84
 /*  f19a084:	924c0000 */ 	lbu	$t4,0x0($s2)
 /*  f19a088:	5581001b */ 	bnel	$t4,$at,.L0f19a0f8
 /*  f19a08c:	82180007 */ 	lb	$t8,0x7($s0)
-/*  f19a090:	0fc4a25f */ 	jal	posGetPlayerNum
+/*  f19a090:	0fc4a25f */ 	jal	propGetPlayerNum
 /*  f19a094:	02402025 */ 	or	$a0,$s2,$zero
 /*  f19a098:	00026880 */ 	sll	$t5,$v0,0x2
 /*  f19a09c:	3c03800a */ 	lui	$v1,0x800a
@@ -837,7 +837,7 @@ glabel func0f19a37c
 /*  f19a3c0:	8d4a84a0 */ 	lw	$t2,-0x7b60($t2)
 /*  f19a3c4:	e7a00050 */ 	swc1	$f0,0x50($sp)
 /*  f19a3c8:	02002025 */ 	or	$a0,$s0,$zero
-/*  f19a3cc:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f19a3cc:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f19a3d0:	afaa0048 */ 	sw	$t2,0x48($sp)
 /*  f19a3d4:	8e0b02d4 */ 	lw	$t3,0x2d4($s0)
 /*  f19a3d8:	02002025 */ 	or	$a0,$s0,$zero
@@ -1230,7 +1230,7 @@ glabel func0f19a850
 /*  f19a964:	316c0080 */ 	andi	$t4,$t3,0x80
 /*  f19a968:	51800040 */ 	beqzl	$t4,.L0f19aa6c
 /*  f19a96c:	8fbf004c */ 	lw	$ra,0x4c($sp)
-/*  f19a970:	0fc0a221 */ 	jal	chrGetTargetPosition
+/*  f19a970:	0fc0a221 */ 	jal	chrGetTargetProp
 /*  f19a974:	02202025 */ 	or	$a0,$s1,$zero
 /*  f19a978:	3c01bf80 */ 	lui	$at,0xbf80
 /*  f19a97c:	44810000 */ 	mtc1	$at,$f0

src/include/commands.h

@@ -349,7 +349,7 @@
 	mkshort(0x0046), \
 	label,
 
-#define if_bitcheck_in_position_struct(label) \
+#define if_bitcheck_in_prop_struct(label) \
 	mkshort(0x0047), \
 	label,
 
@@ -1604,7 +1604,7 @@
 
 // value is either 25, 70 or 335.
 // u1 is either 1 or 2.
-// It seems related to the chr's position properties
+// It seems related to the chr's prop properties
 // Used by G5 cloaked guards, Deep Sea cloaked purple guards and globals.s
 // I think this is related to flanking, where the value arg is the angle
 // relative to the player's direction. 335 is the same as 25 degress to the
@@ -1814,9 +1814,9 @@
 	label,
 
 // If bool is false, run some function on the chr and their gun ground
-// position, then follow the label.
+// prop, then follow the label.
 // If bool is true, don't call the function, and only follow the label if field
-// 0x4 in the gun ground position struct is less than 64.
+// 0x4 in the gun ground prop struct is less than 64.
 #define if_gun_landed(bool, label) \
 	mkshort(0x0170), \
 	bool, \
@@ -2055,9 +2055,9 @@
 	mkshort(0x01a3), \
 	value,
 
-#define display_text(position, color, text) \
+#define display_text(prop, color, text) \
 	mkshort(0x01a4), \
-	position, \
+	prop, \
 	color, \
 	mkshort(text),
 
@@ -2407,7 +2407,7 @@
 	mkshort(0x01de), \
 	label,
 
-// Something to do with the chr's position struct
+// Something to do with the chr's prop struct
 #define cmd01e0 \
 	mkshort(0x01e0),
 

src/include/constants.h

@@ -630,12 +630,12 @@
 #define PATHTYPE_CIRCULAR     1
 #define PATHTYPE_FLYING       2
 
-#define POSITIONTYPE_1      1
-#define POSITIONTYPE_DOOR   2
-#define POSITIONTYPE_CHR    3
-#define POSITIONTYPE_WEAPON 4
-#define POSITIONTYPE_5      5
-#define POSITIONTYPE_PLAYER 6
+#define PROPTYPE_1      1
+#define PROPTYPE_DOOR   2
+#define PROPTYPE_CHR    3
+#define PROPTYPE_WEAPON 4
+#define PROPTYPE_5      5
+#define PROPTYPE_PLAYER 6
 
 #define RACE_HUMAN  0
 #define RACE_SKEDAR 1

src/include/game/chr/chr.h

@@ -16,7 +16,7 @@ f32 chrGetLateralDistanceToCoord(struct chrdata *chr, struct coord *coord);
 f32 chrGetLateralDistanceToPad(struct chrdata *chr, s32 pad_id);
 f32 chrGetSameFloorDistanceToPad(struct chrdata *chr, s32 pad_id);
 f32 chrGetSquaredDistanceToCoord(struct chrdata *chr, struct coord *coord);
-struct position *chrGetTargetPosition(struct chrdata *chr);
+struct prop *chrGetTargetProp(struct chrdata *chr);
 f32 chrGetTimer(struct chrdata *chr);
 bool chrHasFlag(struct chrdata *chr, u32 flag, u8 bank);
 bool chrHasFlagById(struct chrdata *ref, u32 chrnum, u32 flag, u32 bank);
@@ -52,7 +52,7 @@ u32 func0f020668(void);
 u32 func0f020b14(void);
 u32 func0f020cc8(void);
 u32 func0f020d44(void);
-void func0f020f90(s32 positionnum);
+void func0f020f90(s32 propnum);
 u32 func0f021258(void);
 u32 func0f02133c(void);
 u32 func0f0213a0(void);
@@ -157,7 +157,7 @@ void chrSidestep(struct chrdata *chr, s32 arg1);
 void func0f02fc2c(struct chrdata *chr);
 void chrJumpOut(struct chrdata *chr, s32 arg1);
 void func0f02fe18(struct chrdata *chr);
-void chrRunToPos(struct chrdata *chr, struct coord *coord);
+void chrRunToProp(struct chrdata *chr, struct coord *coord);
 void func0f030120(struct chrdata *chr, s32 thingtype, s32 thingid);
 void func0f030308(struct chrdata *chr, s32 thingtype, s32 thingid);
 void func0f0303a0(struct chrdata *chr, s32 thingtype, s32 thingid);
@@ -253,7 +253,7 @@ u32 chrTrySurrender(struct chrdata *chr);
 bool chrFadeOut(struct chrdata *chr);
 bool chrGoToTarget(struct chrdata *chr, u32 speed);
 bool chrGoToChr(struct chrdata *chr, u32 dst_chrnum, u32 speed);
-bool func0f03ab74(struct chrdata *chr, struct position *pos, s32 arg2);
+bool func0f03ab74(struct chrdata *chr, struct prop *prop, s32 arg2);
 u32 func0f03abd0(void);
 u32 func0f03aca0(struct chrdata *chr, u32 arg1, u32 arg2);
 bool chrTryStop(struct chrdata *chr);
@@ -415,9 +415,9 @@ u32 func0f04e418(void);
 u32 getNumChrs(void);
 void incrementByte(u8 *dst, u8 amount);
 s32 chrResolvePadId(struct chrdata *chr, s32 pad_id);
-f32 positionGetDistanceToPosition(struct position *a, struct position *b);
-u32 positionGetIndexByChrId(struct chrdata *chr, s32 chrnum);
-f32 positionGetLateralDistanceToPosition(struct position *a, struct position *b);
+f32 propGetDistanceToProp(struct prop *a, struct prop *b);
+u32 propGetIndexByChrId(struct chrdata *chr, s32 chrnum);
+f32 propGetLateralDistanceToProp(struct prop *a, struct prop *b);
 void func0f01e760(void);
 
 #endif

src/include/game/chr/chraicommands.h

@@ -445,6 +445,6 @@
 /*0x01df*/ bool aiIfChrSameFloorDistanceToPadLessThan(void);
 /*0x01e0*/ bool ai01e0(void);
 
-void func0f05abdc(struct position *pos);
+void func0f05abdc(struct prop *prop);
 
 #endif

src/include/game/game_0601b0.h

@@ -4,13 +4,13 @@
 #include "types.h"
 
 u32 func0f0601b0(void);
-u32 func0f0602f0(struct position *pos);
-u32 func0f060300(struct position *pos);
+u32 func0f0602f0(struct prop *prop);
+u32 func0f060300(struct prop *prop);
 u32 func0f060358(void);
 u32 func0f060438(void);
-void func0f0604bc(struct position *pos);
+void func0f0604bc(struct prop *prop);
 u32 func0f060538(void);
-u32 func0f0605c4(struct position *pos);
+u32 func0f0605c4(struct prop *prop);
 u32 func0f060698(void);
 u32 func0f0606c0(void);
 u32 func0f06071c(void);
@@ -46,8 +46,8 @@ u32 func0f0658e8(void);
 u32 func0f06593c(void);
 u32 func0f0659e4(void);
 u32 func0f065ae0(void);
-void func0f065c44(struct position *pos);
-void func0f065cb0(struct position *pos);
+void func0f065c44(struct prop *prop);
+void func0f065cb0(struct prop *prop);
 u32 func0f065d1c(void);
 u32 func0f065dd8(void);
 u32 func0f065dfc(void);

src/include/game/game_066310.h

@@ -6,7 +6,7 @@
 void alarmActivate(void);
 void alarmDeactivate(void);
 bool alarmIsActive(void);
-bool audioPlayFromWorldPosition(s8 channel_id, s16 audio_id, s32 volumemaybe, struct position *pos, s32 arg4, s32 arg5);
+bool audioPlayFromProp(s8 channel_id, s16 audio_id, s32 volumemaybe, struct prop *prop, s32 arg4, s32 arg5);
 f32 countdownTimerGetValue(void);
 bool countdownTimerIsHidden(void);
 bool countdownTimerIsRunning(void);
@@ -14,7 +14,7 @@ void countdownTimerSetRunning(bool running);
 void countdownTimerSetValue(f32 frames);
 void countdownTimerSetVisible(u32 flag, bool show);
 void countdownTimerTick(void);
-u32 func0f066310(struct position *pos, u32 arg1);
+u32 func0f066310(struct prop *prop, u32 arg1);
 u32 func0f0665ac(void);
 u32 func0f066640(void);
 u32 func0f0666cc(void);
@@ -92,7 +92,7 @@ u32 func0f06a620(void);
 u32 func0f06a730(void);
 u32 func0f06ab60(void);
 u32 func0f06ac40(void);
-void func0f06ac90(struct position *pos);
+void func0f06ac90(struct prop *prop);
 void setupParseObject(u32 *ptr, bool arg1, bool arg2);
 void setupParseObjectWithArg2False(u32 *ptr, bool arg1);
 u32 func0f06b36c(void);
@@ -126,7 +126,7 @@ u32 func0f07092c(void);
 u32 func0f070a1c(void);
 u32 func0f070bd0(void);
 u32 func0f070ca0(void);
-void liftActivate(struct position *pos, u32 arg1);
+void liftActivate(struct prop *prop, u32 arg1);
 u32 func0f070e58(void);
 u32 func0f070eac(void);
 u32 func0f070f08(void);
@@ -206,7 +206,7 @@ void func0f082964(struct attachment *attachment, s32 arg1);
 u32 func0f082a1c(void);
 u32 func0f082d74(void);
 u32 func0f082e84(void);
-u32 func0f082f88(struct position *pos);
+u32 func0f082f88(struct prop *prop);
 u32 func0f08307c(void);
 u32 func0f083db0(void);
 u32 func0f0840ac(void);
@@ -229,7 +229,7 @@ u32 func0f086918(void);
 u32 objIsHealthy(struct defaultobj *obj);
 u32 func0f0869cc(void);
 u32 func0f086d60(void);
-void func0f086f40(struct position *pos);
+void func0f086f40(struct prop *prop);
 u32 func0f087420(void);
 u32 func0f087458(void);
 u32 func0f08756c(void);
@@ -246,7 +246,7 @@ u32 func0f08819c(void);
 u32 func0f088254(void);
 u32 func0f08841c(void);
 u32 func0f0887c8(void);
-u32 func0f088840(struct position *pos, s32 arg1);
+u32 func0f088840(struct prop *prop, s32 arg1);
 u32 func0f089014(void);
 u32 func0f0899dc(void);
 u32 func0f089a94(void);
@@ -322,7 +322,7 @@ u32 func0f08f538(void);
 u32 func0f08f604(void);
 u32 func0f08f968(void);
 u32 func0f08fcb8(void);
-void func0f08fee8(struct position *pos, s32 arg1);
+void func0f08fee8(struct prop *prop, s32 arg1);
 u32 func0f08fffc(void);
 u32 func0f0900c0(void);
 u32 func0f09018c(void);
@@ -351,7 +351,7 @@ u32 func0f0923d4(void);
 u32 func0f092420(void);
 u32 func0f092484(void);
 u32 func0f092610(void);
-u32 func0f0926bc(struct position *pos, u32 arg1, u32 arg2);
+u32 func0f0926bc(struct prop *prop, u32 arg1, u32 arg2);
 s32 func0f0927d4(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4);
 s32 func0f092914(s32 arg0);
 u32 func0f09294c(void);
@@ -363,10 +363,10 @@ u32 func0f093508(void);
 u32 func0f093630(void);
 u32 func0f093790(void);
 u32 func0f0938ec(void);
-void func0f0939f8(s32 arg0, struct position *pos, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, f32 arg9, s32 arg10, s32 arg11, f32 arg12, f32 arg13, f32 arg14);
+void func0f0939f8(s32 arg0, struct prop *prop, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, f32 arg9, s32 arg10, s32 arg11, f32 arg12, f32 arg13, f32 arg14);
 void audioMuteChannel(s32 channel);
 u32 audioIfChannelIdle(s32 channel);
-bool audioPlayFromWorldPosition2(s8 channel_id, s32 audio_id, s32 volumemaybe, struct position *pos, u32 arg4, s32 arg5, s32 arg6, s32 arg7);
+bool audioPlayFromProp2(s8 channel_id, s32 audio_id, s32 volumemaybe, struct prop *prop, u32 arg4, s32 arg5, s32 arg6, s32 arg7);
 u32 func0f0946b0(void);
 u32 func0f094940(void);
 u32 func0f094b1c(void);
@@ -395,7 +395,7 @@ u32 func0f0964b4(void);
 u32 func0f0965e4(void);
 u32 func0f096698(void);
 u32 func0f096700(void);
-struct position *heliGetTargetPosition(struct heliobj *heli);
+struct prop *heliGetTargetProp(struct heliobj *heli);
 struct defaultobj *objFindByTagId(s32 tag_id);
 struct tag *tagFindById(s32 tag_id);
 

src/include/game/game_0c79f0.h

@@ -16,7 +16,7 @@ u32 func0f0c7bd0(void);
 u32 func0f0c7c34(void);
 u32 func0f0c7c98(void);
 u32 func0f0c7cc4(void);
-void currentPlayerGrabProp(struct position *pos);
+void currentPlayerGrabProp(struct prop *prop);
 void func0f0c7d30(u32 arg0);
 void releaseObj(u32 arg0);
 u32 func0f0c7f2c(void);

src/include/game/game_111600.h

@@ -30,7 +30,7 @@ u32 func0f11253c(void);
 u32 func0f112790(void);
 u32 func0f112844(void);
 u32 func0f112884(void);
-u32 currentPlayerHasProp(struct position *pos);
+u32 currentPlayerHasProp(struct prop *prop);
 u32 func0f112950(void);
 u32 func0f112a58(void);
 u32 func0f112bc0(void);

src/include/game/game_11ecf0.h

@@ -64,7 +64,7 @@ u32 func0f128cf0(void);
 u32 func0f128d20(void);
 u32 func0f128dbc(void);
 u32 func0f128ec8(void);
-u32 posGetPlayerNum(struct position *pos);
+u32 propGetPlayerNum(struct prop *prop);
 void setCurrentPlayerNum(u32 playernum);
 
 #endif

src/include/game/game_129900.h

@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f129900(struct position *pos, struct coord *coord, s16 room, s32 arg3, s32 arg4);
+void func0f129900(struct prop *prop, struct coord *coord, s16 room, s32 arg3, s32 arg4);
 u32 func0f129940(void);
 u32 func0f129b08(void);
 u32 func0f129ba4(void);
@@ -21,7 +21,7 @@ u32 func0f12d3f0(void);
 u32 func0f12e1c0(void);
 u32 func0f12e454(void);
 u32 func0f12e5b0(void);
-void func0f12e714(struct position *pos, s32 arg1);
+void func0f12e714(struct prop *prop, s32 arg1);
 u32 func0f12e74c(void);
 u32 func0f12e77c(void);
 u32 func0f12e820(void);
@@ -31,7 +31,7 @@ u32 func0f12f230(void);
 u32 func0f12f5f8(void);
 u32 func0f12f6c0(void);
 u32 func0f12f95c(void);
-void func0f12f9f0(s32 room, struct position *pos, struct coord *coord, s32 arg3, s32 arg4, s32 arg5);
+void func0f12f9f0(s32 room, struct prop *prop, struct coord *coord, s32 arg3, s32 arg4, s32 arg5);
 u32 func0f130044(void);
 u32 func0f131060(void);
 u32 func0f1312d8(void);

src/include/gvars/gvars.h

@@ -90,7 +90,7 @@ struct g_vars {
 	/*00032c*/ u32 unk00032c;
 	/*000330*/ u32 unk000330;
 	/*000334*/ u32 unk000334;
-	/*000338*/ struct position *positions;
+	/*000338*/ struct prop *props;
 	/*00033c*/ u32 unk00033c;
 	/*000340*/ u32 unk000340;
 	/*000344*/ u32 unk000344;

src/include/types.h

@@ -27,14 +27,14 @@ struct attachment {
 
 /**
  * Most, if not all, entity types (chrs, objs, weapons etc) have a pointer to a
- * position struct. The struct contains properties that most entities have in
+ * prop struct. The struct contains properties that most entities have in
  * common such as coords and a room number. You can think of it as generic
  * entity.
  *
  * The type field indicates what type it is (chr, obj etc) and the entity
  * pointer points back to the proper entity struct.
  */
-struct position {
+struct prop {
 	u8 type;
 	u8 flags;
 	u16 unk02;
@@ -276,7 +276,7 @@ struct chrdata {
 	/*0x013*/ s8 path;
 	/*0x014*/ u32 hidden;
 	/*0x018*/ u32 chrflags;
-	/*0x01c*/ struct position *pos;
+	/*0x01c*/ struct prop *prop;
 	/*0x020*/ struct chr020 *unk020;
 	/*0x024*/ u32 chrwidth;
 	/*0x028*/ u32 chrheight;
@@ -373,7 +373,7 @@ struct chrdata {
 	/*0x170*/ struct attachment *weapons_held[2];
 	/*0x178*/ u32 unk178;
 	/*0x17c*/ s8 fireslot[2];
-	/*0x17e*/ s16 target; // index into g_Vars.positions
+	/*0x17e*/ s16 target; // index into g_Vars.props
 	/*0x180*/ f32 cshield;
 	/*0x184*/ u8 cmnum;
 	/*0x185*/ u8 cmnum2;
@@ -425,7 +425,7 @@ struct chrdata {
 	/*0x2fd*/ u8 ivebeenhit;
 	/*0x2fe*/ u8 race;
 	/*0x2ff*/ u8 blurnumtimesdied;
-	/*0x300*/ struct position *gungroundpos;
+	/*0x300*/ struct prop *gunprop;
 	/*0x304*/ u32 pushspeed[2];
 	/*0x30c*/ u32 gunroty[2];
 	/*0x314*/ u32 gunrotx[2];
@@ -483,7 +483,7 @@ struct defaultobj {
 	/*0x08*/ u32 flags;
 	/*0x0c*/ u32 flags2;
 	/*0x10*/ u32 flags3;
-	/*0x14*/ struct position *pos;
+	/*0x14*/ struct prop *prop;
 	/*0x18*/ void *unk18; // probably same struct as chrdata->unk020
 	/*0x1c*/ f32 realrot[9];
 	/*0x40*/ u32 hidden; // most significant nibble is the playernum who holds the obj
@@ -552,7 +552,7 @@ struct weaponobj { // objtype 0x08
 	/*0x08*/ u32 flags;
 	/*0x0c*/ u32 flags2;
 	/*0x10*/ u32 flags3;
-	/*0x14*/ struct position *pos;
+	/*0x14*/ struct prop *prop;
 	/*0x18*/ u32 unk18;
 	/*0x1c*/ f32 realrot[9];
 	/*0x40*/ u32 hidden;
@@ -577,7 +577,7 @@ struct singlemonitorobj { // objtype 0x0a
 	/*0x08*/ u32 flags;
 	/*0x0c*/ u32 flags2;
 	/*0x10*/ u32 flags3;
-	/*0x14*/ struct position *pos;
+	/*0x14*/ struct prop *prop;
 	/*0x18*/ u32 unk18;
 	/*0x1c*/ f32 realrot[9];
 	/*0x40*/ u32 hidden;
@@ -710,7 +710,7 @@ struct player {
 	/*0x00b0*/ u32 unk00b0;
 	/*0x00b4*/ f32 unk00b4;
 	/*0x00b8*/ u32 unk00b8;
-	/*0x00bc*/ struct position *targetpos;
+	/*0x00bc*/ struct prop *prop;
 	/*0x00c0*/ u32 unk00c0;
 	/*0x00c4*/ u32 unk00c4;
 	/*0x00c8*/ u32 unk00c8;
@@ -2080,7 +2080,7 @@ struct player {
 	/*0x1618*/ u32 unk1618;
 	/*0x161c*/ u32 unk161c;
 	/*0x1620*/ u32 unk1620;
-	/*0x1624*/ struct position *lookingatprop;
+	/*0x1624*/ struct prop *lookingatprop;
 	/*0x1628*/ u32 unk1628;
 	/*0x162c*/ u32 unk162c;
 	/*0x1630*/ u32 unk1630;

src/setup/ailists.c

@@ -207,7 +207,7 @@ u8 func0006_unalerted[] = {
 	label(0x13)
 	dprint 'A','L',' ','O','N','A','R','D','\n',0,
 	if_stage_is_not(STAGE_PELAGIC, /*goto*/ 0x16)
-	if_bitcheck_in_position_struct(/*goto*/ LABEL_HEARD_ALARM)
+	if_bitcheck_in_prop_struct(/*goto*/ LABEL_HEARD_ALARM)
 
 	// Check if can see camspy
 	label(0x16)
@@ -2517,7 +2517,7 @@ u8 func0007_alerted[] = {
 		chr_toggle_p1p2(CHR_SELF)
 		set_target_chr(CHR_P1P2)
 		if_chr_in_view(/*goto*/ 0x72)
-		if_bitcheck_in_position_struct(/*goto*/ 0x13)
+		if_bitcheck_in_prop_struct(/*goto*/ 0x13)
 	endloop(0x71)
 
 	// Out of view for 5 seconds - remove