From d5efc7d0f0041534b280592dbbcbe4bd87041044 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 22 Feb 2020 00:50:31 +1000
Subject: [PATCH] Identify and rename some animation symbols

---
 src/game/chr/chraction.c            | 256 ++++++++++++++--------------
 src/game/chr/chrai.c                |   2 +-
 src/game/chr/chraicommands.c        |  62 +++----
 src/game/game_005fd0.c              |   2 +-
 src/game/game_01e250.c              |   6 +-
 src/game/game_066310.c              |   6 +-
 src/game/game_097ba0.c              |   4 +-
 src/game/game_0b63b0.c              |   8 +-
 src/game/game_0f09f0.c              |   4 +-
 src/game/game_148b80.c              |   4 +-
 src/game/game_190260.c              |   4 +-
 src/include/library/library_1a500.h |  26 +--
 src/include/types.h                 |   6 +-
 src/library/library_1a500.c         |   6 +-
 14 files changed, 198 insertions(+), 198 deletions(-)

diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c
index ff75d51cc..ea49ee7f1 100644
--- a/src/game/chr/chraction.c
+++ b/src/game/chr/chraction.c
@@ -508,7 +508,7 @@ glabel func0f02e064
 /*  f02e0a4:	1000001b */ 	beqz	$zero,.L0f02e114
 /*  f02e0a8:	24020001 */ 	addiu	$v0,$zero,0x1
 .L0f02e0ac:
-/*  f02e0ac:	0c00744f */ 	jal	func0001d13c
+/*  f02e0ac:	0c00744f */ 	jal	animGetId
 /*  f02e0b0:	8ca40020 */ 	lw	$a0,0x20($a1)
 /*  f02e0b4:	3c078007 */ 	lui	$a3,%hi(var80068008)
 /*  f02e0b8:	3c088007 */ 	lui	$t0,%hi(var8006801c)
@@ -973,7 +973,7 @@ glabel func0f02e6dc
 .L0f02e71c:
 /*  f02e71c:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f02e720:	afa50030 */ 	sw	$a1,0x30($sp)
-/*  f02e724:	0c00744f */ 	jal	func0001d13c
+/*  f02e724:	0c00744f */ 	jal	animGetId
 /*  f02e728:	afa3002c */ 	sw	$v1,0x2c($sp)
 /*  f02e72c:	820e0007 */ 	lb	$t6,0x7($s0)
 /*  f02e730:	2401000f */ 	addiu	$at,$zero,0xf
@@ -1167,8 +1167,8 @@ void func0f02e9a0(struct chrdata *chr, f32 arg1)
 
 	fsleep = arg1;
 
-	if (chr->unk020->anim->playspeed != 1.0f) {
-		fsleep *= 1.0f / chr->unk020->anim->playspeed;
+	if (chr->animdata->anim->playspeed != 1.0f) {
+		fsleep *= 1.0f / chr->animdata->anim->playspeed;
 	}
 
 	if (fsleep > limit) {
@@ -1177,7 +1177,7 @@ void func0f02e9a0(struct chrdata *chr, f32 arg1)
 
 	chr->sleep = fsleep;
 
-	if (func0001db94(chr->unk020) && !chr->unk2d4) {
+	if (func0001db94(chr->animdata) && !chr->unk2d4) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02e6dc(chr, arg1);
@@ -1207,16 +1207,16 @@ void chrStand(struct chrdata *chr)
 			chr->act_stand.face_target = false;
 
 			if (chr->unk2d4 == NULL) {
-				if (func0001d13c(chr->unk020) == ANIM_KNEEL_SHOOT_RIGHT_HAND) {
+				if (animGetId(chr->animdata) == ANIM_KNEEL_SHOOT_RIGHT_HAND) {
 					result = func0f02e15c(chr, 0.5, 0.8);
-					func0001dccc(chr->unk020, ANIM_KNEEL_SHOOT_RIGHT_HAND,
-							chr->unk020->anim->flip, 109, result, 16);
-					func0001de1c(chr->unk020, 140);
+					func0001dccc(chr->animdata, ANIM_KNEEL_SHOOT_RIGHT_HAND,
+							chr->animdata->anim->flip, 109, result, 16);
+					func0001de1c(chr->animdata, 140);
 				} else {
 					result = func0f02e15c(chr, 0.5, 0.8);
-					func0001dccc(chr->unk020, ANIM_KNEEL_TWO_HANDED_GUN,
-							chr->unk020->anim->flip, 120, result, 16);
-					func0001de1c(chr->unk020, 151);
+					func0001dccc(chr->animdata, ANIM_KNEEL_TWO_HANDED_GUN,
+							chr->animdata->anim->flip, 120, result, 16);
+					func0001de1c(chr->animdata, 151);
 				}
 			}
 		} else if (race == RACE_DRCAROLL || race == RACE_ROBOT) {
@@ -1391,7 +1391,7 @@ void chrKneel(struct chrdata *chr)
 	chr->actiontype = ACT_KNEEL;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->unk020)) {
+	if (func0001db94(chr->animdata)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02ed88(chr);
@@ -1461,7 +1461,7 @@ void func0f02effc(struct chrdata *chr)
 	chr->actiontype = ACT_STARTALARM;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->unk020)) {
+	if (func0001db94(chr->animdata)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02ef40(chr);
@@ -1621,7 +1621,7 @@ void chrThrowGrenade(struct chrdata *chr, s32 hand, s32 needsequip)
 	chr->act_throwgrenade.needsequip = needsequip;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->unk020)) {
+	if (func0001db94(chr->animdata)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02f070(chr);
@@ -1849,7 +1849,7 @@ void func0f02f60c(struct chrdata *chr)
 	chr->act_surprised.unk02c = 2;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->unk020)) {
+	if (func0001db94(chr->animdata)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02f314(chr);
@@ -1864,7 +1864,7 @@ void func0f02f688(struct chrdata *chr)
 	chr->act_surprised.unk02c = 3;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->unk020)) {
+	if (func0001db94(chr->animdata)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02f314(chr);
@@ -1960,7 +1960,7 @@ void chrSurrender(struct chrdata *chr)
 		chr->actiontype = action;
 		chr->sleep = action;
 
-		if (func0001db94(chr->unk020)) {
+		if (func0001db94(chr->animdata)) {
 			chr->hidden |= CHRHFLAG_00200000;
 		} else {
 			func0f02f704(chr);
@@ -2188,7 +2188,7 @@ void chrSidestep(struct chrdata *chr, s32 arg1)
 	chr->act_sidestep.unk02c = arg1;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->unk020)) {
+	if (func0001db94(chr->animdata)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02f8a4(chr);
@@ -2307,7 +2307,7 @@ void chrJumpOut(struct chrdata *chr, s32 arg1)
 	chr->act_jumpout.unk02c = arg1;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->unk020)) {
+	if (func0001db94(chr->animdata)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02fc2c(chr);
@@ -2495,7 +2495,7 @@ void chrRunToPos(struct chrdata *chr, struct coord *pos)
 	chr->act_runpos.unk038 = 30; // float
 	chr->act_runpos.unk040 = 0;
 
-	if (func0001db94(chr->unk020)) {
+	if (func0001db94(chr->animdata)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02fe18(chr);
@@ -3846,7 +3846,7 @@ glabel func0f031384
 /*  f031430:	a2390007 */ 	sb	$t9,0x7($s1)
 /*  f031434:	24180001 */ 	addiu	$t8,$zero,0x1
 /*  f031438:	a3b80053 */ 	sb	$t8,0x53($sp)
-/*  f03143c:	0c00744f */ 	jal	func0001d13c
+/*  f03143c:	0c00744f */ 	jal	animGetId
 /*  f031440:	8e240020 */ 	lw	$a0,0x20($s1)
 /*  f031444:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f031448:	10410019 */ 	beq	$v0,$at,.L0f0314b0
@@ -4672,7 +4672,7 @@ glabel func0f0319a8
 /*  f031fd0:	271852b8 */ 	addiu	$t8,$t8,%lo(var800652b8)
 /*  f031fd4:	145801c9 */ 	bne	$v0,$t8,.L0f0326fc
 /*  f031fd8:	3c198006 */ 	lui	$t9,%hi(var800652bc)
-/*  f031fdc:	0c00744f */ 	jal	func0001d13c
+/*  f031fdc:	0c00744f */ 	jal	animGetId
 /*  f031fe0:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f031fe4:	24010269 */ 	addiu	$at,$zero,0x269
 /*  f031fe8:	10410006 */ 	beq	$v0,$at,.L0f032004
@@ -5442,7 +5442,7 @@ glabel func0f032ac4
 /*  f032b00:	afa30140 */ 	sw	$v1,0x140($sp)
 /*  f032b04:	afa60160 */ 	sw	$a2,0x160($sp)
 /*  f032b08:	afa80154 */ 	sw	$t0,0x154($sp)
-/*  f032b0c:	0c00744f */ 	jal	func0001d13c
+/*  f032b0c:	0c00744f */ 	jal	animGetId
 /*  f032b10:	e7ac015c */ 	swc1	$f12,0x15c($sp)
 /*  f032b14:	24010269 */ 	addiu	$at,$zero,0x269
 /*  f032b18:	8fa30140 */ 	lw	$v1,0x140($sp)
@@ -5788,7 +5788,7 @@ glabel func0f032fe4
 .L0f033010:
 /*  f033010:	afa00038 */ 	sw	$zero,0x38($sp)
 /*  f033014:	8e040020 */ 	lw	$a0,0x20($s0)
-/*  f033018:	0c00744f */ 	jal	func0001d13c
+/*  f033018:	0c00744f */ 	jal	animGetId
 /*  f03301c:	afa3003c */ 	sw	$v1,0x3c($sp)
 /*  f033020:	820e0007 */ 	lb	$t6,0x7($s0)
 /*  f033024:	2401001f */ 	addiu	$at,$zero,0x1f
@@ -6316,7 +6316,7 @@ glabel func0f033728
 .L0f033778:
 /*  f033778:	5440004e */ 	bnezl	$v0,.L0f0338b4
 /*  f03377c:	82180007 */ 	lb	$t8,0x7($s0)
-/*  f033780:	0c00744f */ 	jal	func0001d13c
+/*  f033780:	0c00744f */ 	jal	animGetId
 /*  f033784:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f033788:	24010269 */ 	addiu	$at,$zero,0x269
 /*  f03378c:	10410005 */ 	beq	$v0,$at,.L0f0337a4
@@ -6335,7 +6335,7 @@ glabel func0f033728
 /*  f0337b8:	2401000a */ 	addiu	$at,$zero,0xa
 /*  f0337bc:	55e1003d */ 	bnel	$t7,$at,.L0f0338b4
 /*  f0337c0:	82180007 */ 	lb	$t8,0x7($s0)
-/*  f0337c4:	0c00744f */ 	jal	func0001d13c
+/*  f0337c4:	0c00744f */ 	jal	animGetId
 /*  f0337c8:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f0337cc:	8e03002c */ 	lw	$v1,0x2c($s0)
 /*  f0337d0:	84780000 */ 	lh	$t8,0x0($v1)
@@ -6369,7 +6369,7 @@ glabel func0f033728
 /*  f03383c:	46006086 */ 	mov.s	$f2,$f12
 /*  f033840:	8e040020 */ 	lw	$a0,0x20($s0)
 .L0f033844:
-/*  f033844:	0c00745f */ 	jal	func0001d17c
+/*  f033844:	0c00745f */ 	jal	animGetFrame
 /*  f033848:	e7a20020 */ 	swc1	$f2,0x20($sp)
 /*  f03384c:	c7a20020 */ 	lwc1	$f2,0x20($sp)
 /*  f033850:	8fac0034 */ 	lw	$t4,0x34($sp)
@@ -6386,7 +6386,7 @@ glabel func0f033728
 /*  f033878:	44814000 */ 	mtc1	$at,$f8
 /*  f03387c:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f033880:	46083081 */ 	sub.s	$f2,$f6,$f8
-/*  f033884:	0c00745f */ 	jal	func0001d17c
+/*  f033884:	0c00745f */ 	jal	animGetFrame
 /*  f033888:	e7a20020 */ 	swc1	$f2,0x20($sp)
 /*  f03388c:	c7a20020 */ 	lwc1	$f2,0x20($sp)
 /*  f033890:	8fae0034 */ 	lw	$t6,0x34($sp)
@@ -10293,7 +10293,7 @@ glabel func0f0370a8
 /*  f0370cc:	46000086 */ 	mov.s	$f2,$f0
 /*  f0370d0:	8ca40020 */ 	lw	$a0,0x20($a1)
 .L0f0370d4:
-/*  f0370d4:	0c00744f */ 	jal	func0001d13c
+/*  f0370d4:	0c00744f */ 	jal	animGetId
 /*  f0370d8:	afa50018 */ 	sw	$a1,0x18($sp)
 /*  f0370dc:	00022400 */ 	sll	$a0,$v0,0x10
 /*  f0370e0:	00047c03 */ 	sra	$t7,$a0,0x10
@@ -12080,7 +12080,7 @@ glabel chrGoToPos
 //			func0f036ee4(chr, &chr->act_gopos.unk068, &auStack52[0], &prevpos);
 //		}
 //
-//		if (chr->act_gopos.unk068 != MAX_CHRWAYPOINTS && func0001db94(chr->unk020) != 0 && !chr->unk2d4) {
+//		if (chr->act_gopos.unk068 != MAX_CHRWAYPOINTS && func0001db94(chr->animdata) != 0 && !chr->unk2d4) {
 //			chr->hidden |= CHRHFLAG_00200000;
 //			return true;
 //		} else {
@@ -13050,7 +13050,7 @@ glabel chrIsStopped
 /*  f0395dc:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f0395e0:	00808025 */ 	or	$s0,$a0,$zero
 /*  f0395e4:	afbf001c */ 	sw	$ra,0x1c($sp)
-/*  f0395e8:	0c00744f */ 	jal	func0001d13c
+/*  f0395e8:	0c00744f */ 	jal	animGetId
 /*  f0395ec:	8c840020 */ 	lw	$a0,0x20($a0)
 /*  f0395f0:	24010269 */ 	addiu	$at,$zero,0x269
 /*  f0395f4:	10410003 */ 	beq	$v0,$at,.L0f039604
@@ -13122,7 +13122,7 @@ glabel chrIsStopped
 /*  f0396e4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0396e8:	4500000b */ 	bc1f	.L0f039718
 /*  f0396ec:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f0396f0:	0c00745f */ 	jal	func0001d17c
+/*  f0396f0:	0c00745f */ 	jal	animGetFrame
 /*  f0396f4:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f0396f8:	e7a00020 */ 	swc1	$f0,0x20($sp)
 /*  f0396fc:	0c007468 */ 	jal	func0001d1a0
@@ -13141,7 +13141,7 @@ glabel chrIsStopped
 /*  f03972c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f039730:	45020011 */ 	bc1fl	.L0f039778
 /*  f039734:	00001025 */ 	or	$v0,$zero,$zero
-/*  f039738:	0c00745f */ 	jal	func0001d17c
+/*  f039738:	0c00745f */ 	jal	animGetFrame
 /*  f03973c:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f039740:	44805000 */ 	mtc1	$zero,$f10
 /*  f039744:	00000000 */ 	sll	$zero,$zero,0x0
@@ -13169,7 +13169,7 @@ glabel chrIsStopped
 
 //bool chrIsStopped(struct chrdata *chr)
 //{
-//	u32 anim = func0001d13c(chr->unk020);
+//	u32 anim = animGetId(chr->animdata);
 //
 //	if (anim == ANIM_SNIPING_0269 || anim == ANIM_SNIPING_026B) {
 //		return false;
@@ -13197,11 +13197,11 @@ glabel chrIsStopped
 //			return true;
 //		}
 //
-//		if (func0001d260(chr->unk020) >= 0 && func0001d17c(chr->unk020) >= func0001d1a0(chr->unk020)) {
+//		if (func0001d260(chr->animdata) >= 0 && animGetFrame(chr->animdata) >= func0001d1a0(chr->animdata)) {
 //			return true;
 //		}
 //
-//		if (func0001d260(chr->unk020) >= 0 || func0001d17c(chr->unk020) > 0) {
+//		if (func0001d260(chr->animdata) >= 0 || animGetFrame(chr->animdata) > 0) {
 //			return false;
 //		}
 //	}
@@ -15749,12 +15749,12 @@ glabel chrTickStand
 /*  f03c17c:	0301c824 */ 	and	$t9,$t8,$at
 /*  f03c180:	ae190014 */ 	sw	$t9,0x14($s0)
 .L0f03c184:
-/*  f03c184:	0c00744f */ 	jal	func0001d13c
+/*  f03c184:	0c00744f */ 	jal	animGetId
 /*  f03c188:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f03c18c:	2401026b */ 	addiu	$at,$zero,0x26b
 /*  f03c190:	54410011 */ 	bnel	$v0,$at,.L0f03c1d8
 /*  f03c194:	820b0008 */ 	lb	$t3,0x8($s0)
-/*  f03c198:	0c00745f */ 	jal	func0001d17c
+/*  f03c198:	0c00745f */ 	jal	animGetFrame
 /*  f03c19c:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f03c1a0:	e7a0003c */ 	swc1	$f0,0x3c($sp)
 /*  f03c1a4:	0c007468 */ 	jal	func0001d1a0
@@ -15784,7 +15784,7 @@ glabel chrTickStand
 /*  f03c1fc:	8e0c002c */ 	lw	$t4,0x2c($s0)
 /*  f03c200:	51800012 */ 	beqzl	$t4,.L0f03c24c
 /*  f03c204:	8e0202d4 */ 	lw	$v0,0x2d4($s0)
-/*  f03c208:	0c00745f */ 	jal	func0001d17c
+/*  f03c208:	0c00745f */ 	jal	animGetFrame
 /*  f03c20c:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f03c210:	e7a0003c */ 	swc1	$f0,0x3c($sp)
 /*  f03c214:	0c007468 */ 	jal	func0001d1a0
@@ -16255,7 +16255,7 @@ void chrTickKneel(struct chrdata *chr)
 {
 	chr->sleep = 0;
 
-	if ((chr->hidden & CHRHFLAG_00200000) && func0001db94(chr->unk020) == 0) {
+	if ((chr->hidden & CHRHFLAG_00200000) && func0001db94(chr->animdata) == 0) {
 		func0f02ed88(chr);
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
@@ -16264,33 +16264,33 @@ void chrTickKneel(struct chrdata *chr)
 void chrTickAnim(struct chrdata *chr)
 {
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->unk020)) {
+		if (func0001db94(chr->animdata)) {
 			return;
 		}
 
-		func0001dccc(chr->unk020, chr->act_anim.animnum, chr->act_anim.flip,
+		func0001dccc(chr->animdata, chr->act_anim.animnum, chr->act_anim.flip,
 				chr->act_anim.startframe, chr->act_anim.unk054, chr->act_anim.unk058);
 
 		if (chr->act_anim.unk050 >= 0) {
-			func0001de1c(chr->unk020, chr->act_anim.unk050);
+			func0001de1c(chr->animdata, chr->act_anim.unk050);
 		}
 
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
 
-	if (chr->act_anim.unk030 == 0 && func0001d17c(chr->unk020) >= func0001d1a0(chr->unk020)) {
+	if (chr->act_anim.unk030 == 0 && animGetFrame(chr->animdata) >= func0001d1a0(chr->animdata)) {
 		chrStand(chr);
 	}
 
-	if (chr->act_anim.unk040 != 0 && func0001d17c(chr->unk020) >= (s32)chr->act_anim.unk042) {
+	if (chr->act_anim.unk040 != 0 && animGetFrame(chr->animdata) >= (s32)chr->act_anim.unk042) {
 		chr->act_anim.unk040 = 0;
 		func0f03ba44(chr, chr->act_anim.unk044, chr->act_anim.unk046, chr->act_anim.unk041);
 	}
 
 	// Play sneezing sound
 	if (CHRRACE(chr) == RACE_HUMAN
-			&& func0001d13c(chr->unk020) == ANIM_SNEEZE
-			&& func0001d17c(chr->unk020) >= 42
+			&& animGetId(chr->animdata) == ANIM_SNEEZE
+			&& animGetFrame(chr->animdata) >= 42
 			&& (g_Vars.lvframenum & 1) == 0
 			&& chrGetDistanceToCurrentPlayer(chr) < 800) {
 		func0f0939f8(NULL, chr->prop, 0x37, -1,
@@ -16301,7 +16301,7 @@ void chrTickAnim(struct chrdata *chr)
 		chr->sleep = 14 + (random() % 5);
 	}
 
-	if (func0001d13c(chr->unk020) == ANIM_RELOAD_0209) {
+	if (animGetId(chr->animdata) == ANIM_RELOAD_0209) {
 		chrSetFiring(chr, 0, false);
 		chrSetFiring(chr, 1, false);
 	}
@@ -16310,7 +16310,7 @@ void chrTickAnim(struct chrdata *chr)
 void chrTickSurrender(struct chrdata *chr)
 {
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->unk020)) {
+		if (func0001db94(chr->animdata)) {
 			return;
 		}
 
@@ -16320,18 +16320,18 @@ void chrTickSurrender(struct chrdata *chr)
 
 	if (chr->sleep <= 0) {
 		if (CHRRACE(chr) == RACE_HUMAN) {
-			struct chr020 *chr020 = chr->unk020;
+			struct animdata *animdata = chr->animdata;
 			chr->sleep = 16;
 
-			if (func0001d13c(chr020) == ANIM_SURRENDER_002F && func0001d17c(chr020) >= 80.0f) {
+			if (animGetId(animdata) == ANIM_SURRENDER_002F && animGetFrame(animdata) >= 80.0f) {
 				struct coord coord = var800683bc;
 				f32 value = func0f03e45c(chr);
 				coord.x = -func0001a3dc(value);
 				coord.z = -func0001a3d0(value);
 
 				if (!func0f036918(chr->prop, &coord, 20)) {
-					func0001dccc(chr->unk020, ANIM_SURRENDER_002E, random() & 1, 30, 0.5, 16);
-					func0001ddec(chr->unk020, 30, 16);
+					func0001dccc(chr->animdata, ANIM_SURRENDER_002E, random() & 1, 30, 0.5, 16);
+					func0001ddec(chr->animdata, 30, 16);
 				}
 			}
 		}
@@ -16821,7 +16821,7 @@ glabel chrTickDie
 /*  f03d494:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f03d498:	45020049 */ 	bc1fl	.L0f03d5c0
 /*  f03d49c:	c6120034 */ 	lwc1	$f18,0x34($s0)
-/*  f03d4a0:	0c00745f */ 	jal	func0001d17c
+/*  f03d4a0:	0c00745f */ 	jal	animGetFrame
 /*  f03d4a4:	8fa400ac */ 	lw	$a0,0xac($sp)
 /*  f03d4a8:	c6100030 */ 	lwc1	$f16,0x30($s0)
 /*  f03d4ac:	4600803e */ 	c.le.s	$f16,$f0
@@ -16903,7 +16903,7 @@ glabel chrTickDie
 /*  f03d5cc:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f03d5d0:	45000046 */ 	bc1f	.L0f03d6ec
 /*  f03d5d4:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f03d5d8:	0c00745f */ 	jal	func0001d17c
+/*  f03d5d8:	0c00745f */ 	jal	animGetFrame
 /*  f03d5dc:	8fa400ac */ 	lw	$a0,0xac($sp)
 /*  f03d5e0:	c6080034 */ 	lwc1	$f8,0x34($s0)
 /*  f03d5e4:	3c01bf80 */ 	lui	$at,0xbf80
@@ -16976,7 +16976,7 @@ glabel chrTickDie
 .L0f03d6e8:
 /*  f03d6e8:	e6020034 */ 	swc1	$f2,0x34($s0)
 .L0f03d6ec:
-/*  f03d6ec:	0c00745f */ 	jal	func0001d17c
+/*  f03d6ec:	0c00745f */ 	jal	animGetFrame
 /*  f03d6f0:	8fa400ac */ 	lw	$a0,0xac($sp)
 /*  f03d6f4:	e7a0005c */ 	swc1	$f0,0x5c($sp)
 /*  f03d6f8:	0c007468 */ 	jal	func0001d1a0
@@ -16993,7 +16993,7 @@ glabel chrTickDie
 .L0f03d724:
 /*  f03d724:	14400027 */ 	bnez	$v0,.L0f03d7c4
 /*  f03d728:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f03d72c:	0c00744f */ 	jal	func0001d13c
+/*  f03d72c:	0c00744f */ 	jal	animGetId
 /*  f03d730:	8fa400ac */ 	lw	$a0,0xac($sp)
 /*  f03d734:	24010039 */ 	addiu	$at,$zero,0x39
 /*  f03d738:	14410022 */ 	bne	$v0,$at,.L0f03d7c4
@@ -17229,7 +17229,7 @@ glabel chrTickDruggedComingUp
 
 void chrTickDruggedDrop(struct chrdata *chr)
 {
-	struct chr020 *chr020 = chr->unk020;
+	struct animdata *animdata = chr->animdata;
 	s16 things[11] = {
 		-32627,
 		-32626,
@@ -17245,7 +17245,7 @@ void chrTickDruggedDrop(struct chrdata *chr)
 	};
 	static s32 index = 0;
 
-	if (chr->act_druggeddrop.unk030 >= 0 && func0001d17c(chr020) >= chr->act_druggeddrop.unk030) {
+	if (chr->act_druggeddrop.unk030 >= 0 && animGetFrame(animdata) >= chr->act_druggeddrop.unk030) {
 		func0f0939f8(NULL, chr->prop, things[index], -1,
 				-1, 0, 0, 0,
 				0, -1, 0, -1,
@@ -17260,7 +17260,7 @@ void chrTickDruggedDrop(struct chrdata *chr)
 		chr->act_druggeddrop.unk030 = -1;
 	}
 
-	if (chr->act_druggeddrop.unk034 >= 0 && func0001d17c(chr020) >= chr->act_druggeddrop.unk034) {
+	if (chr->act_druggeddrop.unk034 >= 0 && animGetFrame(animdata) >= chr->act_druggeddrop.unk034) {
 		func0f0939f8(NULL, chr->prop, things[index], -1,
 				-1, 0, 0, 0,
 				0, -1, 0, -1,
@@ -17275,7 +17275,7 @@ void chrTickDruggedDrop(struct chrdata *chr)
 		chr->act_druggeddrop.unk034 = -1;
 	}
 
-	if (func0001d17c(chr020) >= func0001d1a0(chr020)) {
+	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
 		chr->actiontype = ACT_DRUGGEDKO;
 		chr->act_druggedko.unk038 = chr->unk2d4 ? 0 : -1;
 		chr->act_druggedko.unk02c = 0;
@@ -17327,12 +17327,12 @@ void chrTickDruggedKo(struct chrdata *chr)
 
 void chrTickArgh(struct chrdata *chr)
 {
-	struct chr020 *chr020 = chr->unk020;
+	struct animdata *animdata = chr->animdata;
 
-	if (func0001d17c(chr020) >= func0001d1a0(chr020)) {
+	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
 		chrRecordLastSeeTargetTime(chr);
 
-		if (CHRRACE(chr) == RACE_HUMAN && func0001d13c(chr020) == ANIM_DEATH_STOMACH_LONG) {
+		if (CHRRACE(chr) == RACE_HUMAN && animGetId(animdata) == ANIM_DEATH_STOMACH_LONG) {
 			func0f02ed28(chr, 26);
 		} else {
 			if (chr->race == RACE_DRCAROLL) {
@@ -17349,9 +17349,9 @@ void chrTickArgh(struct chrdata *chr)
 
 void chrTickPreArgh(struct chrdata *chr)
 {
-	struct chr020 *chr020 = chr->unk020;
+	struct animdata *animdata = chr->animdata;
 
-	if (func0001d17c(chr020) >= func0001d1a0(chr020)) {
+	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
 		struct coord pos;
 		pos.x = chr->act_preargh.pos.x;
 		pos.y = chr->act_preargh.pos.y;
@@ -17367,10 +17367,10 @@ void chrTickPreArgh(struct chrdata *chr)
 
 void chrTickSidestep(struct chrdata *chr)
 {
-	struct chr020 *chr020 = chr->unk020;
+	struct animdata *animdata = chr->animdata;
 
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->unk020)) {
+		if (func0001db94(chr->animdata)) {
 			return;
 		}
 
@@ -17378,7 +17378,7 @@ void chrTickSidestep(struct chrdata *chr)
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
 
-	if (func0001d17c(chr020) >= func0001d1a0(chr020)) {
+	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
 		chrRecordLastSeeTargetTime(chr);
 		func0f02ed28(chr, 10);
 	}
@@ -17386,10 +17386,10 @@ void chrTickSidestep(struct chrdata *chr)
 
 void chrTickJumpOut(struct chrdata *chr)
 {
-	struct chr020 *chr020 = chr->unk020;
+	struct animdata *animdata = chr->animdata;
 
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->unk020)) {
+		if (func0001db94(chr->animdata)) {
 			return;
 		}
 
@@ -17397,7 +17397,7 @@ void chrTickJumpOut(struct chrdata *chr)
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
 
-	if (func0001d17c(chr020) >= func0001d1a0(chr020)) {
+	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
 		chrRecordLastSeeTargetTime(chr);
 		chrStop(chr);
 	}
@@ -17405,19 +17405,19 @@ void chrTickJumpOut(struct chrdata *chr)
 
 void chrTickTest(struct chrdata *chr)
 {
-	struct chr020 *chr020 = chr->unk020;
+	struct animdata *animdata = chr->animdata;
 
-	if (func0001d17c(chr020) >= func0001d1a0(chr020)) {
+	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
 		chrStand(chr);
 	}
 }
 
 void chrTickStartAlarm(struct chrdata *chr)
 {
-	struct chr020 *chr020 = chr->unk020;
+	struct animdata *animdata = chr->animdata;
 
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->unk020)) {
+		if (func0001db94(chr->animdata)) {
 			return;
 		}
 
@@ -17425,11 +17425,11 @@ void chrTickStartAlarm(struct chrdata *chr)
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
 
-	if (func0001d17c(chr020) >= 60) {
+	if (animGetFrame(animdata) >= 60) {
 		alarmActivate();
 	}
 
-	if (func0001d17c(chr020) >= func0001d1a0(chr020)) {
+	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
 		chrStop(chr);
 	}
 }
@@ -17437,7 +17437,7 @@ void chrTickStartAlarm(struct chrdata *chr)
 void chrTickSurprised(struct chrdata *chr)
 {
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->unk020)) {
+		if (func0001db94(chr->animdata)) {
 			return;
 		}
 
@@ -17446,12 +17446,12 @@ void chrTickSurprised(struct chrdata *chr)
 	}
 
 	if (CHRRACE(chr) == RACE_HUMAN) {
-		struct chr020 *chr020 = chr->unk020;
+		struct animdata *animdata = chr->animdata;
 
-		if (func0001d17c(chr020) >= func0001d1a0(chr020)) {
-			if (func0001d13c(chr020) == 0x2e) {
+		if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
+			if (animGetId(animdata) == 0x2e) {
 				func0f02ed28(chr, 26);
-			} else if (func0001d13c(chr020) == 0x3f) {
+			} else if (animGetId(animdata) == 0x3f) {
 				func0f02ed28(chr, 26);
 			} else {
 				chrStop(chr);
@@ -17651,7 +17651,7 @@ void func0f03e538(struct chrdata *chr, f32 arg1)
 	if (chr->unk2d4) {
 		chr->unk2d4->unk0b0 = arg1;
 	} else {
-		func0001ae90(chr->unk020, arg1);
+		func0001ae90(chr->animdata, arg1);
 	}
 }
 
@@ -17661,7 +17661,7 @@ f32 func0f03e578(struct chrdata *chr)
 		return chr->unk2d4->unk0a4;
 	}
 
-	return func0001ae44(chr->unk020);
+	return func0001ae44(chr->animdata);
 }
 
 void func0f03e5b0(struct chrdata *chr, f32 arg1)
@@ -17669,7 +17669,7 @@ void func0f03e5b0(struct chrdata *chr, f32 arg1)
 	if (chr->unk2d4) {
 		chr->unk2d4->unk0a4 = arg1;
 	} else {
-		func0001ae90(chr->unk020, arg1);
+		func0001ae90(chr->animdata, arg1);
 	}
 }
 
@@ -17807,7 +17807,7 @@ glabel func0f03e788
 /*  f03e7a4:	10a1008e */ 	beq	$a1,$at,.L0f03e9e0
 /*  f03e7a8:	afa70044 */ 	sw	$a3,0x44($sp)
 /*  f03e7ac:	8c840020 */ 	lw	$a0,0x20($a0)
-/*  f03e7b0:	0c00745f */ 	jal	func0001d17c
+/*  f03e7b0:	0c00745f */ 	jal	animGetFrame
 /*  f03e7b4:	afa40034 */ 	sw	$a0,0x34($sp)
 /*  f03e7b8:	e7a00030 */ 	swc1	$f0,0x30($sp)
 /*  f03e7bc:	0fc0f917 */ 	jal	func0f03e45c
@@ -19911,7 +19911,7 @@ glabel func0f0404d4
 /*  f0406d8:	1541000b */ 	bne	$t2,$at,.L0f040708
 /*  f0406dc:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0406e0:	8de40020 */ 	lw	$a0,0x20($t7)
-/*  f0406e4:	0c00744f */ 	jal	func0001d13c
+/*  f0406e4:	0c00744f */ 	jal	animGetId
 /*  f0406e8:	afa60254 */ 	sw	$a2,0x254($sp)
 /*  f0406ec:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f0406f0:	14410005 */ 	bne	$v0,$at,.L0f040708
@@ -21475,7 +21475,7 @@ glabel func0f041d38
 /*  f041d60:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f041d64:	45000016 */ 	bc1f	.L0f041dc0
 /*  f041d68:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f041d6c:	0c00744f */ 	jal	func0001d13c
+/*  f041d6c:	0c00744f */ 	jal	animGetId
 /*  f041d70:	02002025 */ 	or	$a0,$s0,$zero
 /*  f041d74:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f041d78:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -21497,7 +21497,7 @@ glabel func0f041d38
 /*  f041db8:	10000015 */ 	beqz	$zero,.L0f041e10
 /*  f041dbc:	8e29002c */ 	lw	$t1,0x2c($s1)
 .L0f041dc0:
-/*  f041dc0:	0c00744f */ 	jal	func0001d13c
+/*  f041dc0:	0c00744f */ 	jal	animGetId
 /*  f041dc4:	02002025 */ 	or	$a0,$s0,$zero
 /*  f041dc8:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f041dcc:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -21548,10 +21548,10 @@ glabel func0f041e48
 /*  f041e68:	f7b40018 */ 	sdc1	$f20,0x18($sp)
 /*  f041e6c:	8c930020 */ 	lw	$s3,0x20($a0)
 /*  f041e70:	00808025 */ 	or	$s0,$a0,$zero
-/*  f041e74:	0c00745f */ 	jal	func0001d17c
+/*  f041e74:	0c00745f */ 	jal	animGetFrame
 /*  f041e78:	02602025 */ 	or	$a0,$s3,$zero
 /*  f041e7c:	46000506 */ 	mov.s	$f20,$f0
-/*  f041e80:	0c00744f */ 	jal	func0001d13c
+/*  f041e80:	0c00744f */ 	jal	animGetId
 /*  f041e84:	02602025 */ 	or	$a0,$s3,$zero
 /*  f041e88:	24010269 */ 	addiu	$at,$zero,0x269
 /*  f041e8c:	504101de */ 	beql	$v0,$at,.L0f042608
@@ -21598,7 +21598,7 @@ glabel func0f041e48
 /*  f041f2c:	02002025 */ 	or	$a0,$s0,$zero
 /*  f041f30:	14400023 */ 	bnez	$v0,.L0f041fc0
 /*  f041f34:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f041f38:	0c00744f */ 	jal	func0001d13c
+/*  f041f38:	0c00744f */ 	jal	animGetId
 /*  f041f3c:	02602025 */ 	or	$a0,$s3,$zero
 /*  f041f40:	3c013f00 */ 	lui	$at,0x3f00
 /*  f041f44:	4481c000 */ 	mtc1	$at,$f24
@@ -21642,7 +21642,7 @@ glabel func0f041e48
 .L0f041fd4:
 /*  f041fd4:	02602025 */ 	or	$a0,$s3,$zero
 /*  f041fd8:	25d80001 */ 	addiu	$t8,$t6,0x1
-/*  f041fdc:	0c00745f */ 	jal	func0001d17c
+/*  f041fdc:	0c00745f */ 	jal	animGetFrame
 /*  f041fe0:	a2180033 */ 	sb	$t8,0x33($s0)
 /*  f041fe4:	46000506 */ 	mov.s	$f20,$f0
 /*  f041fe8:	3c013f00 */ 	lui	$at,0x3f00
@@ -21655,7 +21655,7 @@ glabel func0f041e48
 /*  f042000:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f042004:	45000080 */ 	bc1f	.L0f042208
 /*  f042008:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f04200c:	0c00744f */ 	jal	func0001d13c
+/*  f04200c:	0c00744f */ 	jal	animGetId
 /*  f042010:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042014:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f042018:	50410018 */ 	beql	$v0,$at,.L0f04207c
@@ -21771,7 +21771,7 @@ glabel func0f041e48
 /*  f0421a8:	a2000031 */ 	sb	$zero,0x31($s0)
 .L0f0421ac:
 /*  f0421ac:	e7ac005c */ 	swc1	$f12,0x5c($sp)
-/*  f0421b0:	0c00744f */ 	jal	func0001d13c
+/*  f0421b0:	0c00744f */ 	jal	animGetId
 /*  f0421b4:	e7a20060 */ 	swc1	$f2,0x60($sp)
 /*  f0421b8:	c7ac005c */ 	lwc1	$f12,0x5c($sp)
 /*  f0421bc:	8e690020 */ 	lw	$t1,0x20($s3)
@@ -21791,11 +21791,11 @@ glabel func0f041e48
 /*  f0421f4:	0c007787 */ 	jal	func0001de1c
 /*  f0421f8:	02602025 */ 	or	$a0,$s3,$zero
 .L0f0421fc:
-/*  f0421fc:	0c00745f */ 	jal	func0001d17c
+/*  f0421fc:	0c00745f */ 	jal	animGetFrame
 /*  f042200:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042204:	46000506 */ 	mov.s	$f20,$f0
 .L0f042208:
-/*  f042208:	0c00744f */ 	jal	func0001d13c
+/*  f042208:	0c00744f */ 	jal	animGetId
 /*  f04220c:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042210:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f042214:	50410030 */ 	beql	$v0,$at,.L0f0422d8
@@ -21862,7 +21862,7 @@ glabel func0f041e48
 /*  f0422f8:	45030008 */ 	bc1tl	.L0f04231c
 /*  f0422fc:	3c013f80 */ 	lui	$at,0x3f80
 .L0f042300:
-/*  f042300:	0c00744f */ 	jal	func0001d13c
+/*  f042300:	0c00744f */ 	jal	animGetId
 /*  f042304:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042308:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f04230c:	1441000b */ 	bne	$v0,$at,.L0f04233c
@@ -21893,7 +21893,7 @@ glabel func0f041e48
 /*  f042360:	824e003a */ 	lb	$t6,0x3a($s2)
 /*  f042364:	15c00066 */ 	bnez	$t6,.L0f042500
 /*  f042368:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f04236c:	0c00744f */ 	jal	func0001d13c
+/*  f04236c:	0c00744f */ 	jal	animGetId
 /*  f042370:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042374:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f042378:	1041000c */ 	beq	$v0,$at,.L0f0423ac
@@ -22002,7 +22002,7 @@ glabel func0f041e48
 /*  f0424f8:	1000003f */ 	beqz	$zero,.L0f0425f8
 /*  f0424fc:	26310001 */ 	addiu	$s1,$s1,0x1
 .L0f042500:
-/*  f042500:	0c00744f */ 	jal	func0001d13c
+/*  f042500:	0c00744f */ 	jal	animGetId
 /*  f042504:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042508:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f04250c:	10410023 */ 	beq	$v0,$at,.L0f04259c
@@ -22095,7 +22095,7 @@ glabel chrTickAttackAmount
 /*  f042634:	00808825 */ 	or	$s1,$a0,$zero
 /*  f042638:	afbf0024 */ 	sw	$ra,0x24($sp)
 /*  f04263c:	afb0001c */ 	sw	$s0,0x1c($sp)
-/*  f042640:	0c00745f */ 	jal	func0001d17c
+/*  f042640:	0c00745f */ 	jal	animGetFrame
 /*  f042644:	8c840020 */ 	lw	$a0,0x20($a0)
 /*  f042648:	e7a00030 */ 	swc1	$f0,0x30($sp)
 /*  f04264c:	8e30002c */ 	lw	$s0,0x2c($s1)
@@ -22759,7 +22759,7 @@ glabel chrTickAttack
 /*  f043004:	00808025 */ 	or	$s0,$a0,$zero
 /*  f043008:	afbf0024 */ 	sw	$ra,0x24($sp)
 /*  f04300c:	8c840020 */ 	lw	$a0,0x20($a0)
-/*  f043010:	0c00745f */ 	jal	func0001d17c
+/*  f043010:	0c00745f */ 	jal	animGetFrame
 /*  f043014:	afa4003c */ 	sw	$a0,0x3c($sp)
 /*  f043018:	e7a00038 */ 	swc1	$f0,0x38($sp)
 /*  f04301c:	8e0e0014 */ 	lw	$t6,0x14($s0)
@@ -22842,7 +22842,7 @@ glabel chrTickAttack
 /*  f043144:	46000086 */ 	mov.s	$f2,$f0
 /*  f043148:	c442001c */ 	lwc1	$f2,0x1c($v0)
 .L0f04314c:
-/*  f04314c:	0c00744f */ 	jal	func0001d13c
+/*  f04314c:	0c00744f */ 	jal	animGetId
 /*  f043150:	e7a20034 */ 	swc1	$f2,0x34($sp)
 /*  f043154:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f043158:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -22969,7 +22969,7 @@ glabel chrTickAttack
 /*  f043320:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f043324:	45000027 */ 	bc1f	.L0f0433c4
 /*  f043328:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f04332c:	0c00744f */ 	jal	func0001d13c
+/*  f04332c:	0c00744f */ 	jal	animGetId
 /*  f043330:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f043334:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f043338:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -23047,7 +23047,7 @@ glabel chrTickAttackRoll
 /*  f043434:	1140013d */ 	beqz	$t2,.L0f04392c
 /*  f043438:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f04343c:	8d240020 */ 	lw	$a0,0x20($t1)
-/*  f043440:	0c00745f */ 	jal	func0001d17c
+/*  f043440:	0c00745f */ 	jal	animGetFrame
 /*  f043444:	afa40044 */ 	sw	$a0,0x44($sp)
 /*  f043448:	8fa70048 */ 	lw	$a3,0x48($sp)
 /*  f04344c:	3c0b8006 */ 	lui	$t3,%hi(var80067548)
@@ -23345,7 +23345,7 @@ glabel chrTickAttackRoll
 /*  f04387c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f043880:	4500002a */ 	bc1f	.L0f04392c
 /*  f043884:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f043888:	0c00744f */ 	jal	func0001d13c
+/*  f043888:	0c00744f */ 	jal	animGetId
 /*  f04388c:	8fa40044 */ 	lw	$a0,0x44($sp)
 /*  f043890:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f043894:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -23468,7 +23468,7 @@ glabel chrTickThrowGrenade
 /*  f043a44:	8fa90040 */ 	lw	$t1,0x40($sp)
 .L0f043a48:
 /*  f043a48:	8d240020 */ 	lw	$a0,0x20($t1)
-/*  f043a4c:	0c00745f */ 	jal	func0001d17c
+/*  f043a4c:	0c00745f */ 	jal	animGetFrame
 /*  f043a50:	afa4003c */ 	sw	$a0,0x3c($sp)
 /*  f043a54:	8faa003c */ 	lw	$t2,0x3c($sp)
 /*  f043a58:	46000086 */ 	mov.s	$f2,$f0
@@ -23494,7 +23494,7 @@ glabel chrTickThrowGrenade
 /*  f043aa4:	10400008 */ 	beqz	$v0,.L0f043ac8
 /*  f043aa8:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f043aac:	afa20030 */ 	sw	$v0,0x30($sp)
-/*  f043ab0:	0c00744f */ 	jal	func0001d13c
+/*  f043ab0:	0c00744f */ 	jal	animGetId
 /*  f043ab4:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f043ab8:	2401003e */ 	addiu	$at,$zero,0x3e
 /*  f043abc:	8fa60030 */ 	lw	$a2,0x30($sp)
@@ -23512,7 +23512,7 @@ glabel chrTickThrowGrenade
 /*  f043ae4:	10c00008 */ 	beqz	$a2,.L0f043b08
 /*  f043ae8:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f043aec:	afa60030 */ 	sw	$a2,0x30($sp)
-/*  f043af0:	0c00744f */ 	jal	func0001d13c
+/*  f043af0:	0c00744f */ 	jal	animGetId
 /*  f043af4:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f043af8:	24010242 */ 	addiu	$at,$zero,0x242
 /*  f043afc:	8fa60030 */ 	lw	$a2,0x30($sp)
@@ -23530,7 +23530,7 @@ glabel chrTickThrowGrenade
 /*  f043b24:	10c0000d */ 	beqz	$a2,.L0f043b5c
 /*  f043b28:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f043b2c:	afa60030 */ 	sw	$a2,0x30($sp)
-/*  f043b30:	0c00744f */ 	jal	func0001d13c
+/*  f043b30:	0c00744f */ 	jal	animGetId
 /*  f043b34:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f043b38:	24010244 */ 	addiu	$at,$zero,0x244
 /*  f043b3c:	8fa60030 */ 	lw	$a2,0x30($sp)
@@ -23554,7 +23554,7 @@ glabel chrTickThrowGrenade
 /*  f043b78:	10c00008 */ 	beqz	$a2,.L0f043b9c
 /*  f043b7c:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f043b80:	afa60030 */ 	sw	$a2,0x30($sp)
-/*  f043b84:	0c00744f */ 	jal	func0001d13c
+/*  f043b84:	0c00744f */ 	jal	animGetId
 /*  f043b88:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f043b8c:	2401003e */ 	addiu	$at,$zero,0x3e
 /*  f043b90:	8fa60030 */ 	lw	$a2,0x30($sp)
@@ -23572,7 +23572,7 @@ glabel chrTickThrowGrenade
 /*  f043bb8:	10c00008 */ 	beqz	$a2,.L0f043bdc
 /*  f043bbc:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f043bc0:	afa60030 */ 	sw	$a2,0x30($sp)
-/*  f043bc4:	0c00744f */ 	jal	func0001d13c
+/*  f043bc4:	0c00744f */ 	jal	animGetId
 /*  f043bc8:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f043bcc:	24010242 */ 	addiu	$at,$zero,0x242
 /*  f043bd0:	8fa60030 */ 	lw	$a2,0x30($sp)
@@ -23590,7 +23590,7 @@ glabel chrTickThrowGrenade
 /*  f043bf8:	10c00016 */ 	beqz	$a2,.L0f043c54
 /*  f043bfc:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f043c00:	afa60030 */ 	sw	$a2,0x30($sp)
-/*  f043c04:	0c00744f */ 	jal	func0001d13c
+/*  f043c04:	0c00744f */ 	jal	animGetId
 /*  f043c08:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f043c0c:	24010244 */ 	addiu	$at,$zero,0x244
 /*  f043c10:	8fa60030 */ 	lw	$a2,0x30($sp)
@@ -23614,7 +23614,7 @@ glabel chrTickThrowGrenade
 .L0f043c54:
 /*  f043c54:	8fa4003c */ 	lw	$a0,0x3c($sp)
 .L0f043c58:
-/*  f043c58:	0c00745f */ 	jal	func0001d17c
+/*  f043c58:	0c00745f */ 	jal	animGetFrame
 /*  f043c5c:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f043c60:	e7a00024 */ 	swc1	$f0,0x24($sp)
 /*  f043c64:	0c007468 */ 	jal	func0001d1a0
@@ -23643,7 +23643,7 @@ glabel chrTickThrowGrenade
 /*  f043cbc:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f043cc0:	45020007 */ 	bc1fl	.L0f043ce0
 /*  f043cc4:	3c0140a0 */ 	lui	$at,0x40a0
-/*  f043cc8:	0c00744f */ 	jal	func0001d13c
+/*  f043cc8:	0c00744f */ 	jal	animGetId
 /*  f043ccc:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f043cd0:	2401003e */ 	addiu	$at,$zero,0x3e
 /*  f043cd4:	10410024 */ 	beq	$v0,$at,.L0f043d68
@@ -23662,7 +23662,7 @@ glabel chrTickThrowGrenade
 /*  f043d04:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f043d08:	45020007 */ 	bc1fl	.L0f043d28
 /*  f043d0c:	3c0141a0 */ 	lui	$at,0x41a0
-/*  f043d10:	0c00744f */ 	jal	func0001d13c
+/*  f043d10:	0c00744f */ 	jal	animGetId
 /*  f043d14:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f043d18:	24010242 */ 	addiu	$at,$zero,0x242
 /*  f043d1c:	10410012 */ 	beq	$v0,$at,.L0f043d68
@@ -23681,7 +23681,7 @@ glabel chrTickThrowGrenade
 /*  f043d4c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f043d50:	45020012 */ 	bc1fl	.L0f043d9c
 /*  f043d54:	8fbf001c */ 	lw	$ra,0x1c($sp)
-/*  f043d58:	0c00744f */ 	jal	func0001d13c
+/*  f043d58:	0c00744f */ 	jal	animGetId
 /*  f043d5c:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f043d60:	24010244 */ 	addiu	$at,$zero,0x244
 /*  f043d64:	1441000c */ 	bne	$v0,$at,.L0f043d98
@@ -24010,7 +24010,7 @@ glabel chrTickAttackWalk
 /*  f0442c0:	50200029 */ 	beqzl	$at,.L0f044368
 /*  f0442c4:	c64a0008 */ 	lwc1	$f10,0x8($s2)
 .L0f0442c8:
-/*  f0442c8:	0c00745f */ 	jal	func0001d17c
+/*  f0442c8:	0c00745f */ 	jal	animGetFrame
 /*  f0442cc:	02202025 */ 	or	$a0,$s1,$zero
 /*  f0442d0:	e7a00034 */ 	swc1	$f0,0x34($sp)
 /*  f0442d4:	0c007486 */ 	jal	func0001d218
@@ -24487,10 +24487,10 @@ glabel chrTickRunPos
 .L0f044970:
 /*  f044970:	15000003 */ 	bnez	$t0,.L0f044980
 /*  f044974:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f044978:	0c00744f */ 	jal	func0001d13c
+/*  f044978:	0c00744f */ 	jal	animGetId
 /*  f04497c:	8fa40040 */ 	lw	$a0,0x40($sp)
 .L0f044980:
-/*  f044980:	0c00745f */ 	jal	func0001d17c
+/*  f044980:	0c00745f */ 	jal	animGetFrame
 /*  f044984:	8fa40040 */ 	lw	$a0,0x40($sp)
 /*  f044988:	44803000 */ 	mtc1	$zero,$f6
 /*  f04498c:	44802000 */ 	mtc1	$zero,$f4
@@ -24583,7 +24583,7 @@ glabel chrTickRunPos
 /*  f044ad0:	44811000 */ 	mtc1	$at,$f2
 /*  f044ad4:	1500000e */ 	bnez	$t0,.L0f044b10
 /*  f044ad8:	24010001 */ 	addiu	$at,$zero,0x1
-/*  f044adc:	0c00744f */ 	jal	func0001d13c
+/*  f044adc:	0c00744f */ 	jal	animGetId
 /*  f044ae0:	8fa40040 */ 	lw	$a0,0x40($sp)
 /*  f044ae4:	24010059 */ 	addiu	$at,$zero,0x59
 /*  f044ae8:	14410005 */ 	bne	$v0,$at,.L0f044b00
@@ -27860,7 +27860,7 @@ glabel chrTickSkJump
 /*  f047ab8:	44050000 */ 	mfc1	$a1,$f0
 /*  f047abc:	0fc0f94e */ 	jal	func0f03e538
 /*  f047ac0:	02002025 */ 	or	$a0,$s0,$zero
-/*  f047ac4:	0c00745f */ 	jal	func0001d17c
+/*  f047ac4:	0c00745f */ 	jal	animGetFrame
 /*  f047ac8:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f047acc:	e7a0005c */ 	swc1	$f0,0x5c($sp)
 /*  f047ad0:	0c007468 */ 	jal	func0001d1a0
@@ -32699,12 +32699,12 @@ s32 func0f004cd84(s32 arg0, s32 arg1)
 
 void func0f04cf90(struct chrdata *chr, s32 arg1)
 {
-	if (chr && chr->unk020 && chr->unk020->unk08) {
-		s32 value = func0001a91c(chr->unk020->unk08, arg1);
+	if (chr && chr->animdata && chr->animdata->unk08) {
+		s32 value = func0001a91c(chr->animdata->unk08, arg1);
 		u32 *ptr = NULL;
 
 		if (value != 0) {
-			ptr = func0001aa1c(chr->unk020, value);
+			ptr = func0001aa1c(chr->animdata, value);
 		}
 
 		if (ptr) {
@@ -33025,7 +33025,7 @@ glabel var7f1a9448
 
 bool func0f04d44c(struct chrdata *chr)
 {
-	s32 val = func0001d13c(chr->unk020);
+	s32 val = animGetId(chr->animdata);
 	chr->chrflags &= ~CHRCFLAG_10000000;
 
 	// Possible @bug or just sloppy code: The flag check below can never pass
diff --git a/src/game/chr/chrai.c b/src/game/chr/chrai.c
index 8660fd316..a9f4259e7 100644
--- a/src/game/chr/chrai.c
+++ b/src/game/chr/chrai.c
@@ -99,7 +99,7 @@ void chraiExecute(void *entity, s32 proptype)
 
 		// Check if the ailist should be switched to a different one
 		if (g_Vars.chrdata && (g_Vars.chrdata->chrflags & CHRCFLAG_00200000)) {
-			u32 animnum = func0001d13c(g_Vars.chrdata->unk020);
+			u32 animnum = animGetId(g_Vars.chrdata->animdata);
 			if (g_Vars.chrdata->aishotlist >= 0
 					&& g_Vars.chrdata->cshield <= 0
 					&& (0 <= g_Vars.chrdata->damage || g_Vars.chrdata->gunprop != NULL)
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index d76c1b5ac..74ba91255 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -439,7 +439,7 @@ bool aiChrDoAnimation(void)
 		fendframe = endframe;
 	}
 
-	if (chr && chr->unk020) {
+	if (chr && chr->animdata) {
 		f32 result = 1.0f / (s32)cmd[11];
 
 		if (g_Vars.in_cutscene) {
@@ -534,7 +534,7 @@ bool aiIfChrDying(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) && (!chr || !chr->unk020 || chrIsDead(chr))) {
+	if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) && (!chr || !chr->animdata || chrIsDead(chr))) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
 	} else {
 		g_Vars.aioffset += 4;
@@ -581,7 +581,7 @@ bool aiIfChrUnloaded(void)
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
 	if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) &&
-			(!chr || !chr->unk020 || chr->actiontype == ACT_DRUGGEDKO || chr->actiontype == ACT_DRUGGEDDROP || chr->actiontype == ACT_DRUGGEDCOMINGUP)) {
+			(!chr || !chr->animdata || chr->actiontype == ACT_DRUGGEDKO || chr->actiontype == ACT_DRUGGEDDROP || chr->actiontype == ACT_DRUGGEDCOMINGUP)) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
 	} else {
 		g_Vars.aioffset += 4;
@@ -2516,8 +2516,8 @@ bool aiObjectMoveToPad(void)
 				-pad.look.x, -pad.look.y, -pad.look.z,
 				pad.up.x, pad.up.y, pad.up.z);
 
-		if (obj->unk18) {
-			func00015f04(obj->unk18->unk14, matrix);
+		if (obj->animdata) {
+			func00015f04(obj->animdata->unk14, matrix);
 		}
 
 		rooms[0] = pad.room;
@@ -4435,7 +4435,7 @@ bool aiTryEquipWeapon(void)
 	u32 model = cmd[3] | (cmd[2] << 8);
 	struct prop *prop = NULL;
 
-	if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->unk020) {
+	if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->animdata) {
 		if (cheatIsActive(CHEAT_MARQUIS)) {
 			flags &= ~0x10000000;
 			flags |= 0x20000000;
@@ -4511,7 +4511,7 @@ bool aiTryEquipHat(void)
 	u32 thing = cmd[3] | (cmd[2] << 8);
 	bool ok = false;
 
-	if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->unk020) {
+	if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->animdata) {
 		ok = chrTryEquipHat(g_Vars.chrdata, thing, flags);
 	}
 
@@ -5469,22 +5469,22 @@ bool aiObjectDoAnimation(void)
 	}
 
 	if (obj && obj->prop) {
-		struct anim *anim = obj->unk18->anim;
+		struct anim *anim = obj->animdata->anim;
 
-		if (obj->unk18->anim == NULL) {
-			obj->unk18->anim = func0f0b32e4();
+		if (obj->animdata->anim == NULL) {
+			obj->animdata->anim = func0f0b32e4();
 		}
 
-		if (obj->unk18->anim) {
+		if (obj->animdata->anim) {
 			thing = 1.0f / (s32)cmd[5];
 
 			if (g_Vars.in_cutscene && startframe != 0xfffe) {
 				fstartframe += var8009de20 * thing * 0.25f;
 			}
 
-			func000230a0(obj->unk18->anim);
-			func0001dccc(obj->unk18, anim_id, 0, fstartframe, thing, 0);
-			func0001af64(obj->unk18, func0f15c888() * obj->unk18->unk14 * 100.0f);
+			func000230a0(obj->animdata->anim);
+			func0001dccc(obj->animdata, anim_id, 0, fstartframe, thing, 0);
+			func0001af64(obj->animdata, func0f15c888() * obj->animdata->unk14 * 100.0f);
 		}
 	}
 
@@ -5501,7 +5501,7 @@ bool aiShowChr(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->prop && chr->unk020) {
+	if (chr && chr->prop && chr->animdata) {
 		func0f0604bc(chr->prop);
 		propHide(chr->prop);
 		func0f0220ac(chr);
@@ -5520,7 +5520,7 @@ bool aiHideChr(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->prop && chr->unk020) {
+	if (chr && chr->prop && chr->animdata) {
 		func0f065c44(chr->prop);
 		func0f0605c4(chr->prop);
 		func0f060300(chr->prop);
@@ -5539,7 +5539,7 @@ bool aiShowObj(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct defaultobj *obj = objFindByTagId(cmd[2]);
 
-	if (obj && obj->prop && obj->unk18) {
+	if (obj && obj->prop && obj->animdata) {
 		func0f0604bc(obj->prop);
 		propHide(obj->prop);
 
@@ -5565,7 +5565,7 @@ bool aiHideObj(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct defaultobj *obj = objFindByTagId(cmd[2]);
 
-	if (obj && obj->prop && obj->unk18) {
+	if (obj && obj->prop && obj->animdata) {
 		if (obj->prop->parent) {
 			func0f082f88(obj->prop);
 		} else {
@@ -6551,7 +6551,7 @@ bool aiIfCompareChrPresetsTeam(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, CHR_PRESET);
 
-	if (!chr || (!chr->unk020 && chr->prop->type != PROPTYPE_PLAYER)) {
+	if (!chr || (!chr->animdata && chr->prop->type != PROPTYPE_PLAYER)) {
 		chrSetChrPreset(g_Vars.chrdata, CHR_BOND);
 		chr = chrFindById(g_Vars.chrdata, CHR_PRESET);
 	}
@@ -6862,7 +6862,7 @@ glabel var7f1a9d4c
 //	while (*chrnums != -2) {
 //		struct chrdata *chr = chrFindByLiteralId(*chrnums);
 //
-//		if (chr && chr->unk020
+//		if (chr && chr->animdata
 //				&& !chrIsDead(chr)
 //				&& chr->actiontype != ACT_DEAD
 //				&& chr->alertness > 100 // @bug? I don't think this goes higher than 100
@@ -7400,7 +7400,7 @@ bool aiIfSafetyLessThan(void)
 	while (*chrnums != -2) {
 		struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-		if (chr && chr->unk020
+		if (chr && chr->animdata
 				&& !chrIsDead(chr)
 				&& chr->actiontype != ACT_DEAD
 				&& g_Vars.chrdata->chrnum != chr->chrnum
@@ -8263,7 +8263,7 @@ glabel aiSayQuip
 //		while (*chrnums != -2) {
 //			loopchr = chrFindByLiteralId(*chrnums);
 //
-//			if (loopchr && loopchr->unk020
+//			if (loopchr && loopchr->animdata
 //					&& !chrIsDead(loopchr)
 //					&& loopchr->actiontype != ACT_DEAD
 //					&& g_Vars.chrdata->squadron == loopchr->squadron
@@ -8420,7 +8420,7 @@ glabel aiSayQuip
 
 void func0f05abdc(struct prop *prop)
 {
-	if (prop && prop->chr && prop->chr->unk020 && prop->chr->propsoundcount > 0) {
+	if (prop && prop->chr && prop->chr->animdata && prop->chr->propsoundcount > 0) {
 		prop->chr->propsoundcount--;
 	}
 }
@@ -8454,7 +8454,7 @@ bool aiIncreaseSquadronAlertness(void)
 		struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
 		if (chr &&
-				chr->unk020 &&
+				chr->animdata &&
 				!chrIsDead(chr) &&
 				chr->actiontype != ACT_DEAD &&
 				(g_Vars.chrdata->squadron == chr->squadron || g_Vars.chrdata->squadron == 255) &&
@@ -8509,7 +8509,7 @@ bool aiSetTeamOrders(void)
 		while (*chrnums != -2) {
 			struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-			if (chr && chr->unk020
+			if (chr && chr->animdata
 					&& !chrIsDead(chr)
 					&& chr->actiontype != ACT_DEAD
 					&& chrCompareTeams(g_Vars.chrdata, chr, true)
@@ -8697,7 +8697,7 @@ bool aiIfChrInSquadronDoingAction(void)
 		for (; *chrnums != -2; chrnums++) {
 			struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-			if (chr && chr->unk020 && chrIsDead(chr) == false &&
+			if (chr && chr->animdata && chrIsDead(chr) == false &&
 					chr->actiontype != ACT_DEAD &&
 					chrCompareTeams(g_Vars.chrdata, chr, 1) &&
 					g_Vars.chrdata->chrnum != chr->chrnum &&
@@ -8751,7 +8751,7 @@ bool aiSetChrPresetToUnalertedTeammate(void)
 	for (; *chrnums != -2; chrnums++) {
 		struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-		if (cmd[3] == 0 && chr && chr->unk020 &&
+		if (cmd[3] == 0 && chr && chr->animdata &&
 				chrIsDead(chr) == false &&
 				chr->actiontype != ACT_DEAD &&
 				chr->actiontype != ACT_DIE &&
@@ -9059,7 +9059,7 @@ bool aiIfSquadronIsDead(void)
 		while (*chrnums != -2) {
 			struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-			if (chr && chr->unk020) {
+			if (chr && chr->animdata) {
 				anyalive = false;
 
 				if (!chrIsDead(chr) && chr->actiontype != ACT_DEAD) {
@@ -9421,7 +9421,7 @@ bool aiIfChrHasGun(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->unk020 && chr->gunprop == NULL) {
+	if (chr && chr->animdata && chr->gunprop == NULL) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
 	} else {
 		g_Vars.aioffset += 5;
@@ -9560,7 +9560,7 @@ bool aiChrCopyProperties(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->unk020) {
+	if (chr && chr->animdata) {
 		g_Vars.chrdata->hearingscale = chr->hearingscale;
 		g_Vars.chrdata->visionrange = chr->visionrange;
 		g_Vars.chrdata->padpreset1 = chr->padpreset1;
@@ -10874,7 +10874,7 @@ bool aiSetChrHudpieceVisible(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->prop && chr->unk020) {
+	if (chr && chr->prop && chr->animdata) {
 		chrSetHudpieceVisible(chr, cmd[3]);
 	}
 
diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c
index fbfe9506e..539220217 100644
--- a/src/game/game_005fd0.c
+++ b/src/game/game_005fd0.c
@@ -346,7 +346,7 @@ glabel func0f0061dc
 /*  f0062bc:	e7a0006c */ 	swc1	$f0,0x6c($sp)
 .L0f0062c0:
 /*  f0062c0:	8e240020 */ 	lw	$a0,0x20($s1)
-/*  f0062c4:	0c00744f */ 	jal	func0001d13c
+/*  f0062c4:	0c00744f */ 	jal	animGetId
 /*  f0062c8:	afa30050 */ 	sw	$v1,0x50($sp)
 /*  f0062cc:	8fa30050 */ 	lw	$v1,0x50($sp)
 /*  f0062d0:	24010023 */ 	addiu	$at,$zero,0x23
diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c
index e21e7c096..17bc4bba0 100644
--- a/src/game/game_01e250.c
+++ b/src/game/game_01e250.c
@@ -2740,7 +2740,7 @@ void chrInit(struct prop *prop, u8 *ailist)
 	chr->headnum = 0;
 	chr->bodynum = 0;
 	chr->prop = prop;
-	chr->unk020 = NULL;
+	chr->animdata = NULL;
 	chr->numarghs = 0;
 	chr->lastwalk60 = 0;
 	chr->invalidmove = 0;
@@ -5579,13 +5579,13 @@ glabel func0f023098
 /*  f023340:	84842972 */ 	lh	$a0,0x2972($a0)
 /*  f023344:	10400025 */ 	beqz	$v0,.L0f0233dc
 /*  f023348:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f02334c:	0c00744f */ 	jal	func0001d13c
+/*  f02334c:	0c00744f */ 	jal	animGetId
 /*  f023350:	8fa40208 */ 	lw	$a0,0x208($sp)
 /*  f023354:	3c038006 */ 	lui	$v1,0x8006
 /*  f023358:	8c632970 */ 	lw	$v1,0x2970($v1)
 /*  f02335c:	5443000b */ 	bnel	$v0,$v1,.L0f02338c
 /*  f023360:	44800000 */ 	mtc1	$zero,$f0
-/*  f023364:	0c00744f */ 	jal	func0001d13c
+/*  f023364:	0c00744f */ 	jal	animGetId
 /*  f023368:	8fa40208 */ 	lw	$a0,0x208($sp)
 /*  f02336c:	00022400 */ 	sll	$a0,$v0,0x10
 /*  f023370:	00047c03 */ 	sra	$t7,$a0,0x10
diff --git a/src/game/game_066310.c b/src/game/game_066310.c
index 807a11766..99dcfa7fc 100644
--- a/src/game/game_066310.c
+++ b/src/game/game_066310.c
@@ -28410,7 +28410,7 @@ glabel func0f07e758
 /*  f07ea0c:	24010006 */ 	addiu	$at,$zero,0x6
 /*  f07ea10:	13010016 */ 	beq	$t8,$at,.L0f07ea6c
 /*  f07ea14:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f07ea18:	0c00745f */ 	jal	func0001d17c
+/*  f07ea18:	0c00745f */ 	jal	animGetFrame
 /*  f07ea1c:	01202025 */ 	or	$a0,$t1,$zero
 /*  f07ea20:	e7a00044 */ 	swc1	$f0,0x44($sp)
 /*  f07ea24:	0c007486 */ 	jal	func0001d218
@@ -28780,7 +28780,7 @@ glabel func0f07e758
 /*  f07ef84:	0fc1979d */ 	jal	func0f065e74
 /*  f07ef88:	afa50034 */ 	sw	$a1,0x34($sp)
 .L0f07ef8c:
-/*  f07ef8c:	0c00745f */ 	jal	func0001d17c
+/*  f07ef8c:	0c00745f */ 	jal	animGetFrame
 /*  f07ef90:	8fa40254 */ 	lw	$a0,0x254($sp)
 /*  f07ef94:	e7a00044 */ 	swc1	$f0,0x44($sp)
 /*  f07ef98:	0c007486 */ 	jal	func0001d218
@@ -38149,7 +38149,7 @@ void propObjGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin)
 			*ymin = obj->geo->ymin;
 			*ymax = obj->geo->ymax;
 		} else {
-			*width = func0001af80(obj->unk18);
+			*width = func0001af80(obj->animdata);
 			*ymin = obj->geo->ymin;
 			*ymax = obj->geo->ymax;
 		}
diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c
index 09de9c092..802de05df 100644
--- a/src/game/game_097ba0.c
+++ b/src/game/game_097ba0.c
@@ -511,7 +511,7 @@ glabel func0f09815c
 /*  f098194:	0c007486 */ 	jal	func0001d218
 /*  f098198:	afa40018 */ 	sw	$a0,0x18($sp)
 /*  f09819c:	8fa40018 */ 	lw	$a0,0x18($sp)
-/*  f0981a0:	0c00745f */ 	jal	func0001d17c
+/*  f0981a0:	0c00745f */ 	jal	animGetFrame
 /*  f0981a4:	afa2001c */ 	sw	$v0,0x1c($sp)
 /*  f0981a8:	8fb8001c */ 	lw	$t8,0x1c($sp)
 /*  f0981ac:	44982000 */ 	mtc1	$t8,$f4
@@ -520,7 +520,7 @@ glabel func0f09815c
 /*  f0981b8:	10000007 */ 	beqz	$zero,.L0f0981d8
 /*  f0981bc:	46003001 */ 	sub.s	$f0,$f6,$f0
 .L0f0981c0:
-/*  f0981c0:	0c00745f */ 	jal	func0001d17c
+/*  f0981c0:	0c00745f */ 	jal	animGetFrame
 /*  f0981c4:	24a40384 */ 	addiu	$a0,$a1,0x384
 /*  f0981c8:	10000004 */ 	beqz	$zero,.L0f0981dc
 /*  f0981cc:	8fbf0014 */ 	lw	$ra,0x14($sp)
diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c
index c4e863e44..a7f75c11b 100644
--- a/src/game/game_0b63b0.c
+++ b/src/game/game_0b63b0.c
@@ -11530,7 +11530,7 @@ glabel func0f0c07c8
 /*  f0c0c80:	ac79032c */ 	sw	$t9,0x32c($v1)
 /*  f0c0c84:	8e030284 */ 	lw	$v1,0x284($s0)
 .L0f0c0c88:
-/*  f0c0c88:	0c00745f */ 	jal	func0001d17c
+/*  f0c0c88:	0c00745f */ 	jal	animGetFrame
 /*  f0c0c8c:	2464045c */ 	addiu	$a0,$v1,0x45c
 /*  f0c0c90:	8e040284 */ 	lw	$a0,0x284($s0)
 /*  f0c0c94:	e7a00040 */ 	swc1	$f0,0x40($sp)
@@ -13254,7 +13254,7 @@ glabel func0f0c2364
 /*  f0c2608:	0fc0a209 */ 	jal	chrGetEquippedWeaponProp
 /*  f0c260c:	00002825 */ 	or	$a1,$zero,$zero
 /*  f0c2610:	afa20068 */ 	sw	$v0,0x68($sp)
-/*  f0c2614:	0c00744f */ 	jal	func0001d13c
+/*  f0c2614:	0c00744f */ 	jal	animGetId
 /*  f0c2618:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f0c261c:	afa20078 */ 	sw	$v0,0x78($sp)
 /*  f0c2620:	0fc331ab */ 	jal	func0f0cc6ac
@@ -13284,7 +13284,7 @@ glabel func0f0c2364
 /*  f0c267c:	8e040020 */ 	lw	$a0,0x20($s0)
 .L0f0c2680:
 /*  f0c2680:	e7a20070 */ 	swc1	$f2,0x70($sp)
-/*  f0c2684:	0c00744f */ 	jal	func0001d13c
+/*  f0c2684:	0c00744f */ 	jal	animGetId
 /*  f0c2688:	e7a00074 */ 	swc1	$f0,0x74($sp)
 /*  f0c268c:	8fb80078 */ 	lw	$t8,0x78($sp)
 /*  f0c2690:	c7a00074 */ 	lwc1	$f0,0x74($sp)
@@ -13588,7 +13588,7 @@ glabel func0f0c2a58
 /*  f0c2ac8:	afa70050 */ 	sw	$a3,0x50($sp)
 /*  f0c2acc:	afa60054 */ 	sw	$a2,0x54($sp)
 /*  f0c2ad0:	afa50058 */ 	sw	$a1,0x58($sp)
-/*  f0c2ad4:	0c00744f */ 	jal	func0001d13c
+/*  f0c2ad4:	0c00744f */ 	jal	animGetId
 /*  f0c2ad8:	afa3005c */ 	sw	$v1,0x5c($sp)
 /*  f0c2adc:	afa20040 */ 	sw	$v0,0x40($sp)
 /*  f0c2ae0:	0fc0e6a5 */ 	jal	chrIsDead
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index 7c246fbb5..8796e3748 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -5097,7 +5097,7 @@ glabel func0f0f38b0
 /*  f0f4a2c:	0c007486 */ 	jal	func0001d218
 /*  f0f4a30:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f0f4a34:	afa2004c */ 	sw	$v0,0x4c($sp)
-/*  f0f4a38:	0c00745f */ 	jal	func0001d17c
+/*  f0f4a38:	0c00745f */ 	jal	animGetFrame
 /*  f0f4a3c:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f0f4a40:	8fae004c */ 	lw	$t6,0x4c($sp)
 /*  f0f4a44:	448e3000 */ 	mtc1	$t6,$f6
@@ -5106,7 +5106,7 @@ glabel func0f0f38b0
 /*  f0f4a50:	10000004 */ 	beqz	$zero,.L0f0f4a64
 /*  f0f4a54:	46005081 */ 	sub.s	$f2,$f10,$f0
 .L0f0f4a58:
-/*  f0f4a58:	0c00745f */ 	jal	func0001d17c
+/*  f0f4a58:	0c00745f */ 	jal	animGetFrame
 /*  f0f4a5c:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f0f4a60:	46000086 */ 	mov.s	$f2,$f0
 .L0f0f4a64:
diff --git a/src/game/game_148b80.c b/src/game/game_148b80.c
index da086cada..aa3705f05 100644
--- a/src/game/game_148b80.c
+++ b/src/game/game_148b80.c
@@ -101,7 +101,7 @@ glabel func0f148b80
 /*  f148c6c:	8c640020 */ 	lw	$a0,0x20($v1)
 /*  f148c70:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f148c74:	a3a80043 */ 	sb	$t0,0x43($sp)
-/*  f148c78:	0c00745f */ 	jal	func0001d17c
+/*  f148c78:	0c00745f */ 	jal	animGetFrame
 /*  f148c7c:	afa3004c */ 	sw	$v1,0x4c($sp)
 /*  f148c80:	c7a20038 */ 	lwc1	$f2,0x38($sp)
 /*  f148c84:	8fa3004c */ 	lw	$v1,0x4c($sp)
@@ -111,7 +111,7 @@ glabel func0f148b80
 /*  f148c94:	45020007 */ 	bc1fl	.L0f148cb4
 /*  f148c98:	946d0336 */ 	lhu	$t5,0x336($v1)
 /*  f148c9c:	8c640020 */ 	lw	$a0,0x20($v1)
-/*  f148ca0:	0c00745f */ 	jal	func0001d17c
+/*  f148ca0:	0c00745f */ 	jal	animGetFrame
 /*  f148ca4:	afa3004c */ 	sw	$v1,0x4c($sp)
 /*  f148ca8:	10000061 */ 	beqz	$zero,.L0f148e30
 /*  f148cac:	8fa3004c */ 	lw	$v1,0x4c($sp)
diff --git a/src/game/game_190260.c b/src/game/game_190260.c
index 69b274130..a754c50f5 100644
--- a/src/game/game_190260.c
+++ b/src/game/game_190260.c
@@ -438,10 +438,10 @@ void mpInitSimulant(struct chrdata *chr, u8 full)
 		thing = scenarioCallback2c(chr->chrwidth, &pos, rooms, chr->prop);
 		chr->hidden |= CHRHFLAG_00100000;
 		chrMoveToPos(chr, &pos, rooms, thing, true);
-		chr->unk2d4->unk0a4 = func0001ae44(chr->unk020);
+		chr->unk2d4->unk0a4 = func0001ae44(chr->animdata);
 		chr->unk2d4->unk0a8 = 0;
 		chr->unk2d4->unk0ac = 0;
-		chr->unk2d4->unk0b0 = func0001ae44(chr->unk020);
+		chr->unk2d4->unk0b0 = func0001ae44(chr->animdata);
 		chr->unk2d4->unk0b4 = 0;
 		chr->unk2d4->unk0b8 = 0;
 		func0f02e9a0(chr, 0);
diff --git a/src/include/library/library_1a500.h b/src/include/library/library_1a500.h
index 9c7350d7c..6776dfa26 100644
--- a/src/include/library/library_1a500.h
+++ b/src/include/library/library_1a500.h
@@ -17,17 +17,17 @@ u32 func0001a85c(void);
 s32 func0001a91c(u32 arg0, s32 arg1);
 u32 func0001a9bc(void);
 u32 func0001a9e8(void);
-u32 *func0001aa1c(struct chr020 *chr020, s32 arg1);
+u32 *func0001aa1c(struct animdata *animdata, s32 arg1);
 u32 func0001ab0c(void);
 u32 func0001abc4(void);
 u32 func0001ad0c(void);
 u32 func0001ad34(void);
 u32 func0001ad5c(void);
-f32 func0001ae44(struct chr020 *chr020);
-void func0001ae90(struct chr020 *chr020, f32 arg1);
+f32 func0001ae44(struct animdata *animdata);
+void func0001ae90(struct animdata *animdata, f32 arg1);
 u32 func0001af58(void);
-void func0001af64(struct chr020 *chr020, f32 arg1);
-f32 func0001af80(struct chr020 *chr020);
+void func0001af64(struct animdata *animdata, f32 arg1);
+f32 func0001af80(struct animdata *animdata);
 u32 func0001af98(void);
 f32 func0001afe8(f32 arg0, f32 distance, f32 arg2);
 u32 func0001b07c(void);
@@ -50,22 +50,22 @@ u32 func0001cc20(void);
 u32 func0001cd18(void);
 u32 func0001ce64(void);
 u32 func0001cebc(void);
-u32 func0001d13c(struct chr020 *chr020);
+u32 animGetId(struct animdata *animdata);
 u32 func0001d15c(void);
-f32 func0001d17c(struct chr020 *chr020);
-f32 func0001d1a0(struct chr020 *chr020);
+f32 animGetFrame(struct animdata *animdata);
+f32 func0001d1a0(struct animdata *animdata);
 u32 func0001d218(void);
-f32 func0001d260(struct chr020 *chr020);
+f32 func0001d260(struct animdata *animdata);
 u32 func0001d288(void);
 u32 func0001d320(void);
 u32 func0001d4fc(void);
 u32 func0001d62c(void);
-u32 func0001db94(struct chr020 *chr020);
+u32 func0001db94(struct animdata *animdata);
 u32 func0001dbfc(void);
-void func0001dccc(struct chr020 *chr020, s32 animnum, s32 flip, f32 fstartframe, f32 arg4, f32 arg5);
+void func0001dccc(struct animdata *animdata, s32 animnum, s32 flip, f32 fstartframe, f32 arg4, f32 arg5);
 u32 func0001dd90(void);
-void func0001ddec(struct chr020 *chr020, f32 arg1, f32 arg2);
-void func0001de1c(struct chr020 *chr020, f32 arg1);
+void func0001ddec(struct animdata *animdata, f32 arg1, f32 arg2);
+void func0001de1c(struct animdata *animdata, f32 arg1);
 u32 func0001de98(void);
 u32 func0001deb0(void);
 u32 func0001df04(void);
diff --git a/src/include/types.h b/src/include/types.h
index 00320c518..1ce88a766 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -125,7 +125,7 @@ struct anim {
 	/*0x88*/ u32 animscale;
 };
 
-struct chr020 {
+struct animdata {
 	/*0x00*/ u32 unk00;
 	/*0x04*/ u32 unk04;
 	/*0x08*/ u32 unk08;
@@ -530,7 +530,7 @@ struct chrdata {
 	/*0x014*/ u32 hidden;
 	/*0x018*/ u32 chrflags;
 	/*0x01c*/ struct prop *prop;
-	/*0x020*/ struct chr020 *unk020;
+	/*0x020*/ struct animdata *animdata;
 	/*0x024*/ f32 chrwidth;
 	/*0x028*/ f32 chrheight;
 
@@ -731,7 +731,7 @@ struct defaultobj {
 	/*0x0c*/ u32 flags2;
 	/*0x10*/ u32 flags3;
 	/*0x14*/ struct prop *prop;
-	/*0x18*/ struct chr020 *unk18;
+	/*0x18*/ struct animdata *animdata;
 	/*0x1c*/ f32 realrot[9];
 	/*0x40*/ u32 hidden; // most significant nibble is the playernum who holds the obj
 	/*0x44*/ struct geo *geo;
diff --git a/src/library/library_1a500.c b/src/library/library_1a500.c
index fa303b00e..63c8af42d 100644
--- a/src/library/library_1a500.c
+++ b/src/library/library_1a500.c
@@ -3550,7 +3550,7 @@ glabel func0001cebc
 );
 
 GLOBAL_ASM(
-glabel func0001d13c
+glabel animGetId
 /*    1d13c:	8c830020 */ 	lw	$v1,0x20($a0)
 /*    1d140:	00001025 */ 	or	$v0,$zero,$zero
 /*    1d144:	10600003 */ 	beqz	$v1,.L0001d154
@@ -3576,7 +3576,7 @@ glabel func0001d15c
 );
 
 GLOBAL_ASM(
-glabel func0001d17c
+glabel animGetFrame
 /*    1d17c:	8c820020 */ 	lw	$v0,0x20($a0)
 /*    1d180:	50400004 */ 	beqzl	$v0,.L0001d194
 /*    1d184:	44800000 */ 	mtc1	$zero,$f0
@@ -3635,7 +3635,7 @@ glabel func0001d218
 /*    1d224:	00001025 */ 	or	$v0,$zero,$zero
 /*    1d228:	11c00009 */ 	beqz	$t6,.L0001d250
 /*    1d22c:	00000000 */ 	sll	$zero,$zero,0x0
-/*    1d230:	0c00744f */ 	jal	func0001d13c
+/*    1d230:	0c00744f */ 	jal	animGetId
 /*    1d234:	00000000 */ 	sll	$zero,$zero,0x0
 /*    1d238:	00022400 */ 	sll	$a0,$v0,0x10
 /*    1d23c:	00047c03 */ 	sra	$t7,$a0,0x10