falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename animdata to model and other related symbols

This commit is contained in:
Ryan Dwyer 2020-06-01 17:54:56 +10:00
parent c9ec0be8ce
commit a78e70e36a
32 changed files with 346 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/bondbike.c
View File

@ -160,9 +160,9 @@ void func0f0d2294(void)
{
struct defaultobj *hoverbike = g_Vars.currentplayer->hoverbike->obj;
g_Vars.currentplayer->unk1a70 = 0.0f / hoverbike->animdata->unk14;
g_Vars.currentplayer->unk1a74 = 80.0f / hoverbike->animdata->unk14;
g_Vars.currentplayer->unk1a78 = -50.0f / hoverbike->animdata->unk14;
g_Vars.currentplayer->unk1a70 = 0.0f / hoverbike->model->unk14;
g_Vars.currentplayer->unk1a74 = 80.0f / hoverbike->model->unk14;
g_Vars.currentplayer->unk1a78 = -50.0f / hoverbike->model->unk14;
}
GLOBAL_ASM(

2
src/game/bondmove.c
View File

@ -5433,7 +5433,7 @@ void func0f0cbf50(void)
if (g_Vars.currentplayer->prop) {
struct chrdata *chr = g_Vars.currentplayer->prop->chr;
if (chr && chr->animdata) {
if (chr && chr->model) {
func0f03e538(chr, BADDEG2RAD(360 - g_Vars.currentplayer->vv_theta));
}
}

34
src/game/chr/chr.c
View File

@ -2486,7 +2486,7 @@ void chrInit(struct prop *prop, u8 *ailist)
chr->headnum = 0;
chr->bodynum = 0;
chr->prop = prop;
chr->animdata = NULL;
chr->model = NULL;
chr->numarghs = 0;
chr->lastwalk60 = 0;
chr->invalidmove = 0;
@ -2680,7 +2680,7 @@ void chrInit(struct prop *prop, u8 *ailist)
chrInitSplats(chr);
}
struct prop *func0f020b14(struct prop *prop, struct animdata *animdata,
struct prop *func0f020b14(struct prop *prop, struct model *model,
struct coord *pos, s16 *rooms, f32 arg4, u8 *ailist)
{
struct chrdata *chr;
@ -2696,12 +2696,12 @@ struct prop *func0f020b14(struct prop *prop, struct animdata *animdata,
chr = prop->chr;
func0001e000(animdata, func0f01f378);
animdata->chr = chr;
animdata->unk01 = 1;
chr->animdata = animdata;
func0001e000(model, func0f01f378);
model->chr = chr;
model->unk01 = 1;
chr->model = model;
func0f03e538(chr, arg4);
func0001dfac(animdata, var80062968, 0);
func0001dfac(model, var80062968, 0);
testpos.x = pos->x;
testpos.y = pos->y + 100;
@ -2718,12 +2718,12 @@ struct prop *func0f020b14(struct prop *prop, struct animdata *animdata,
func0f065c44(prop);
roomsCopy(rooms, prop->rooms);
func0f0220ac(chr);
func0001ad34(animdata, &prop->pos);
func0001ad34(model, &prop->pos);
value = chr->animdata->unk08->unk00->unk00;
value = chr->model->unk08->unk00->unk00;
if ((value & 0xff) == 1) {
struct animdata10 *thing = func0001aa1c(chr->animdata, chr->animdata->unk08->unk00);
struct model10 *thing = func0001aa1c(chr->model, chr->model->unk08->unk00);
thing->ground = ground;
}
@ -2736,12 +2736,12 @@ struct prop *func0f020b14(struct prop *prop, struct animdata *animdata,
return prop;
}
struct prop *func0f020cc8(struct animdata *animdata, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist)
struct prop *func0f020cc8(struct model *model, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist)
{
struct prop *prop = propAllocate();
if (prop) {
prop = func0f020b14(prop, animdata, pos, rooms, arg3, ailist);
prop = func0f020b14(prop, model, pos, rooms, arg3, ailist);
if (cheatIsActive(CHEAT_ENEMYSHIELDS)) {
chrSetShield(prop->chr, 8);
@ -2950,8 +2950,8 @@ void func0f0211a8(f32 arg0)
var80062968 = arg0;
for (i = 0; i < g_NumChrsA; i++) {
if (g_ChrsA[i].animdata) {
func0001dfac(g_ChrsA[i].animdata, var80062968, 600);
if (g_ChrsA[i].model) {
func0001dfac(g_ChrsA[i].model, var80062968, 600);
}
}
}
@ -4971,13 +4971,13 @@ glabel var7f1a87d8
/* f023340: 84842972 */ lh $a0,%lo(var80062970+0x2)($a0)
/* f023344: 10400025 */ beqz $v0,.L0f0233dc
/* f023348: 00000000 */ sll $zero,$zero,0x0
/* f02334c: 0c00744f */ jal animGetId
/* f02334c: 0c00744f */ jal modelGetAnimNum
/* f023350: 8fa40208 */ lw $a0,0x208($sp)
/* f023354: 3c038006 */ lui $v1,%hi(var80062970)
/* f023358: 8c632970 */ lw $v1,%lo(var80062970)($v1)
/* f02335c: 5443000b */ bnel $v0,$v1,.L0f02338c
/* f023360: 44800000 */ mtc1 $zero,$f0
/* f023364: 0c00744f */ jal animGetId
/* f023364: 0c00744f */ jal modelGetAnimNum
/* f023368: 8fa40208 */ lw $a0,0x208($sp)
/* f02336c: 00022400 */ sll $a0,$v0,0x10
/* f023370: 00047c03 */ sra $t7,$a0,0x10
@ -10849,7 +10849,7 @@ glabel var7f1a8948
// f32 add = 0.75f;
//
// for (i = 0; i < g_NumChrsA; i++) {
// if (g_ChrsA[i].animdata) {
// if (g_ChrsA[i].model) {
// struct prop *prop = g_ChrsA[i].prop;
//
// if (prop && prop->type == PROPTYPE_CHR &&

366
src/game/chr/chraction.c
View File

File diff suppressed because it is too large Load Diff

2
src/game/chr/chrai.c
View File

@ -710,7 +710,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 = animGetId(g_Vars.chrdata->animdata);
u32 animnum = modelGetAnimNum(g_Vars.chrdata->model);
if (g_Vars.chrdata->aishotlist >= 0
&& g_Vars.chrdata->cshield <= 0
&& (0 <= g_Vars.chrdata->damage || g_Vars.chrdata->gunprop != NULL)

66
src/game/chr/chraicommands.c
View File

@ -413,7 +413,7 @@ bool aiChrDoAnimation(void)
if (startframe == 0xffff) {
fstartframe = 0;
} else if (startframe == 0xfffe) {
fstartframe = animGetNumFrames(anim_id) - 1;
fstartframe = modelGetNumAnimFrames(anim_id) - 1;
} else {
fstartframe = startframe;
}
@ -424,7 +424,7 @@ bool aiChrDoAnimation(void)
fendframe = endframe;
}
if (chr && chr->animdata) {
if (chr && chr->model) {
f32 result = 1.0f / (s32)cmd[11];
if (g_Vars.in_cutscene) {
@ -519,7 +519,7 @@ bool aiIfChrDead(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->animdata || chrIsDead(chr))) {
if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) && (!chr || !chr->model || chrIsDead(chr))) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@ -566,7 +566,7 @@ bool aiIfChrKnockedOut(void)
struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) &&
(!chr || !chr->animdata || chr->actiontype == ACT_DRUGGEDKO || chr->actiontype == ACT_DRUGGEDDROP || chr->actiontype == ACT_DRUGGEDCOMINGUP)) {
(!chr || !chr->model || 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;
@ -2500,8 +2500,8 @@ bool aiObjectMoveToPad(void)
-pad.look.x, -pad.look.y, -pad.look.z,
pad.up.x, pad.up.y, pad.up.z);
if (obj->animdata) {
func00015f04(obj->animdata->unk14, matrix);
if (obj->model) {
func00015f04(obj->model->unk14, matrix);
}
rooms[0] = pad.room;
@ -4419,7 +4419,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->animdata) {
if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->model) {
if (cheatIsActive(CHEAT_MARQUIS)) {
flags &= ~0x10000000;
flags |= 0x20000000;
@ -4495,7 +4495,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->animdata) {
if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->model) {
ok = chrTryEquipHat(g_Vars.chrdata, thing, flags);
}
@ -5326,7 +5326,7 @@ bool aiObjectDoAnimation(void)
if (startframe == 0xffff) {
fstartframe = 0;
} else if (startframe == 0xfffe) {
fstartframe = animGetNumFrames(anim_id) - 2;
fstartframe = modelGetNumAnimFrames(anim_id) - 2;
if (fstartframe < 0) {
fstartframe = 0;
@ -5344,22 +5344,22 @@ bool aiObjectDoAnimation(void)
}
if (obj && obj->prop) {
struct anim *anim = obj->animdata->anim;
struct anim *anim = obj->model->anim;
if (obj->animdata->anim == NULL) {
obj->animdata->anim = func0f0b32e4();
if (obj->model->anim == NULL) {
obj->model->anim = func0f0b32e4();
}
if (obj->animdata->anim) {
if (obj->model->anim) {
thing = 1.0f / (s32)cmd[5];
if (g_Vars.in_cutscene && startframe != 0xfffe) {
fstartframe += var8009de20 * thing * 0.25f;
}
func000230a0(obj->animdata->anim);
func0001dccc(obj->animdata, anim_id, 0, fstartframe, thing, 0);
func0001af64(obj->animdata, func0f15c888() * obj->animdata->unk14 * 100.0f);
func000230a0(obj->model->anim);
func0001dccc(obj->model, anim_id, 0, fstartframe, thing, 0);
func0001af64(obj->model, func0f15c888() * obj->model->unk14 * 100.0f);
}
}
@ -5376,7 +5376,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->animdata) {
if (chr && chr->prop && chr->model) {
func0f0604bc(chr->prop);
propHide(chr->prop);
func0f0220ac(chr);
@ -5395,7 +5395,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->animdata) {
if (chr && chr->prop && chr->model) {
func0f065c44(chr->prop);
func0f0605c4(chr->prop);
func0f060300(chr->prop);
@ -5414,7 +5414,7 @@ bool aiShowObj(void)
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
struct defaultobj *obj = objFindByTagId(cmd[2]);
if (obj && obj->prop && obj->animdata) {
if (obj && obj->prop && obj->model) {
func0f0604bc(obj->prop);
propHide(obj->prop);
@ -5440,7 +5440,7 @@ bool aiHideObj(void)
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
struct defaultobj *obj = objFindByTagId(cmd[2]);
if (obj && obj->prop && obj->animdata) {
if (obj && obj->prop && obj->model) {
if (obj->prop->parent) {
func0f082f88(obj->prop);
} else {
@ -6422,7 +6422,7 @@ bool aiIfCompareChrPresetsTeam(void)
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
struct chrdata *chr = chrFindById(g_Vars.chrdata, CHR_PRESET);
if (!chr || (!chr->animdata && chr->prop->type != PROPTYPE_PLAYER)) {
if (!chr || (!chr->model && chr->prop->type != PROPTYPE_PLAYER)) {
chrSetChrPreset(g_Vars.chrdata, CHR_BOND);
chr = chrFindById(g_Vars.chrdata, CHR_PRESET);
}
@ -6733,7 +6733,7 @@ glabel var7f1a9d4c
// while (*chrnums != -2) {
// struct chrdata *chr = chrFindByLiteralId(*chrnums);
//
// if (chr && chr->animdata
// if (chr && chr->model
// && !chrIsDead(chr)
// && chr->actiontype != ACT_DEAD
// && chr->alertness > 100 // @bug? I don't think this goes higher than 100
@ -7271,7 +7271,7 @@ bool aiIfSafetyLessThan(void)
while (*chrnums != -2) {
struct chrdata *chr = chrFindByLiteralId(*chrnums);
if (chr && chr->animdata
if (chr && chr->model
&& !chrIsDead(chr)
&& chr->actiontype != ACT_DEAD
&& g_Vars.chrdata->chrnum != chr->chrnum
@ -8384,7 +8384,7 @@ glabel aiSayQuip
// while (*chrnums != -2) {
// loopchr = chrFindByLiteralId(*chrnums);
//
// if (loopchr && loopchr->animdata
// if (loopchr && loopchr->model
// && !chrIsDead(loopchr)
// && loopchr->actiontype != ACT_DEAD
// && g_Vars.chrdata->squadron == loopchr->squadron
@ -8545,7 +8545,7 @@ glabel aiSayQuip
void func0f05abdc(struct prop *prop)
{
if (prop && prop->chr && prop->chr->animdata && prop->chr->propsoundcount > 0) {
if (prop && prop->chr && prop->chr->model && prop->chr->propsoundcount > 0) {
prop->chr->propsoundcount--;
}
}
@ -8579,7 +8579,7 @@ bool aiIncreaseSquadronAlertness(void)
struct chrdata *chr = chrFindByLiteralId(*chrnums);
if (chr &&
chr->animdata &&
chr->model &&
!chrIsDead(chr) &&
chr->actiontype != ACT_DEAD &&
(g_Vars.chrdata->squadron == chr->squadron || g_Vars.chrdata->squadron == 255) &&
@ -8634,7 +8634,7 @@ bool aiSetTeamOrders(void)
while (*chrnums != -2) {
struct chrdata *chr = chrFindByLiteralId(*chrnums);
if (chr && chr->animdata
if (chr && chr->model
&& !chrIsDead(chr)
&& chr->actiontype != ACT_DEAD
&& chrCompareTeams(g_Vars.chrdata, chr, true)
@ -8822,7 +8822,7 @@ bool aiIfChrInSquadronDoingAction(void)
for (; *chrnums != -2; chrnums++) {
struct chrdata *chr = chrFindByLiteralId(*chrnums);
if (chr && chr->animdata && chrIsDead(chr) == false &&
if (chr && chr->model && chrIsDead(chr) == false &&
chr->actiontype != ACT_DEAD &&
chrCompareTeams(g_Vars.chrdata, chr, 1) &&
g_Vars.chrdata->chrnum != chr->chrnum &&
@ -8876,7 +8876,7 @@ bool aiSetChrPresetToUnalertedTeammate(void)
for (; *chrnums != -2; chrnums++) {
struct chrdata *chr = chrFindByLiteralId(*chrnums);
if (cmd[3] == 0 && chr && chr->animdata &&
if (cmd[3] == 0 && chr && chr->model &&
chrIsDead(chr) == false &&
chr->actiontype != ACT_DEAD &&
chr->actiontype != ACT_DIE &&
@ -9213,7 +9213,7 @@ bool aiIfSquadronIsDead(void)
while (*chrnums != -2) {
struct chrdata *chr = chrFindByLiteralId(*chrnums);
if (chr && chr->animdata) {
if (chr && chr->model) {
anyalive = false;
if (!chrIsDead(chr) && chr->actiontype != ACT_DEAD) {
@ -9508,7 +9508,7 @@ bool aiIfChrHasGun(void)
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
if (chr && chr->animdata && chr->gunprop == NULL) {
if (chr && chr->model && chr->gunprop == NULL) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
} else {
g_Vars.aioffset += 5;
@ -9647,7 +9647,7 @@ bool aiChrCopyProperties(void)
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
if (chr && chr->animdata) {
if (chr && chr->model) {
g_Vars.chrdata->hearingscale = chr->hearingscale;
g_Vars.chrdata->visionrange = chr->visionrange;
g_Vars.chrdata->padpreset1 = chr->padpreset1;
@ -11029,7 +11029,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->animdata) {
if (chr && chr->prop && chr->model) {
chrSetHudpieceVisible(chr, cmd[3]);
}

4
src/game/game_000130.c
View File

@ -363,14 +363,14 @@ glabel func0f0005c0
/* f0005c0: 27bdffe0 */ addiu $sp,$sp,-32
/* f0005c4: afbf0014 */ sw $ra,0x14($sp)
/* f0005c8: afa40020 */ sw $a0,0x20($sp)
/* f0005cc: 0c008dda */ jal animGetNumFrames
/* f0005cc: 0c008dda */ jal modelGetNumAnimFrames
/* f0005d0: 87a40022 */ lh $a0,0x22($sp)
/* f0005d4: 87a40022 */ lh $a0,0x22($sp)
/* f0005d8: 00002825 */ or $a1,$zero,$zero
/* f0005dc: 0fc000d6 */ jal func0f000358
/* f0005e0: 2446ffff */ addiu $a2,$v0,-1
/* f0005e4: afa20018 */ sw $v0,0x18($sp)
/* f0005e8: 0c008dda */ jal animGetNumFrames
/* f0005e8: 0c008dda */ jal modelGetNumAnimFrames
/* f0005ec: 87a40022 */ lh $a0,0x22($sp)
/* f0005f0: 8fae0018 */ lw $t6,0x18($sp)
/* f0005f4: 44824000 */ mtc1 $v0,$f8

2
src/game/game_005fd0.c
View File

@ -161,7 +161,7 @@ glabel func0f0061dc
/* f0062bc: e7a0006c */ swc1 $f0,0x6c($sp)
.L0f0062c0:
/* f0062c0: 8e240020 */ lw $a0,0x20($s1)
/* f0062c4: 0c00744f */ jal animGetId
/* f0062c4: 0c00744f */ jal modelGetAnimNum
/* f0062c8: afa30050 */ sw $v1,0x50($sp)
/* f0062cc: 8fa30050 */ lw $v1,0x50($sp)
/* f0062d0: 24010023 */ addiu $at,$zero,0x23

8
src/game/game_016100.c
View File

@ -59,12 +59,12 @@ u32 var800624e8 = 0x00000001;
u32 var800624ec = 0x00000001;
u32 var800624f0 = 0x00000000;
u32 var800624f4 = 0x00000001;
struct animdata *g_TitleModel = NULL;
struct animdata *g_TitleModel2 = NULL;
struct model *g_TitleModel = NULL;
struct model *g_TitleModel2 = NULL;
u32 var80062500 = 0x00000000;
u32 var80062504 = 0x00000000;
struct animdata *var80062508 = NULL;
struct animdata *var8006250c = NULL;
struct model *var80062508 = NULL;
struct model *var8006250c = NULL;
u32 var80062510 = 0x00000000;
u32 var80062514 = 0x00000000;
u32 var80062518 = 0x96969600;

8
src/game/game_02cde0.c
View File

@ -958,7 +958,7 @@ struct prop *propAllocateEyespy(struct pad *pad, s16 room)
s16 rooms[2];
struct prop *prop;
struct chrdata *chr;
struct animdata *animdata;
struct model *model;
s32 inlift;
struct prop *lift;
f32 ground;
@ -991,10 +991,10 @@ struct prop *propAllocateEyespy(struct pad *pad, s16 room)
}
#endif
animdata = func0f02d36c(BODY_EYESPY, 0, 0);
model = func0f02d36c(BODY_EYESPY, 0, 0);
if (animdata) {
prop = func0f020cc8(animdata, &pad->pos, rooms, 0, ailistFindById(GAILIST_IDLE));
if (model) {
prop = func0f020cc8(model, &pad->pos, rooms, 0, ailistFindById(GAILIST_IDLE));
if (prop) {
func0f0604bc(prop);

4
src/game/game_097ba0.c
View File

@ -751,7 +751,7 @@ glabel func0f09815c
/* f098194: 0c007486 */ jal func0001d218
/* f098198: afa40018 */ sw $a0,0x18($sp)
/* f09819c: 8fa40018 */ lw $a0,0x18($sp)
/* f0981a0: 0c00745f */ jal animGetFrame
/* f0981a0: 0c00745f */ jal modelGetCurAnimFrame
/* f0981a4: afa2001c */ sw $v0,0x1c($sp)
/* f0981a8: 8fb8001c */ lw $t8,0x1c($sp)
/* f0981ac: 44982000 */ mtc1 $t8,$f4
@ -760,7 +760,7 @@ glabel func0f09815c
/* f0981b8: 10000007 */ beqz $zero,.L0f0981d8
/* f0981bc: 46003001 */ sub.s $f0,$f6,$f0
.L0f0981c0:
/* f0981c0: 0c00745f */ jal animGetFrame
/* f0981c0: 0c00745f */ jal modelGetCurAnimFrame
/* f0981c4: 24a40384 */ addiu $a0,$a1,0x384
/* f0981c8: 10000004 */ beqz $zero,.L0f0981dc
/* f0981cc: 8fbf0014 */ lw $ra,0x14($sp)

14
src/game/game_0b63b0.c
View File

@ -4431,7 +4431,7 @@ void func0f0ba010(void)
var8009de2c = -1;
var80070764 = 1;
func0f11dcb0(1);
g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_6 && var8009de10 < animGetNumFrames(var8009de18) - 1;
g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_6 && var8009de10 < modelGetNumAnimFrames(var8009de18) - 1;
g_Vars.unk0004e2 = 0;
}
@ -4506,7 +4506,7 @@ glabel var7f1ad5d8
/* f0ba198: ac24de2c */ sw $a0,%lo(var8009de2c)($at)
/* f0ba19c: afbf0024 */ sw $ra,0x24($sp)
/* f0ba1a0: 3c04800a */ lui $a0,%hi(var8009de18)
/* f0ba1a4: 0c008dda */ jal animGetNumFrames
/* f0ba1a4: 0c008dda */ jal modelGetNumAnimFrames
/* f0ba1a8: 8484de18 */ lh $a0,%lo(var8009de18)($a0)
/* f0ba1ac: 244effff */ addiu $t6,$v0,-1
/* f0ba1b0: 3c04800a */ lui $a0,%hi(var8009de18)
@ -4605,7 +4605,7 @@ glabel var7f1ad5dc
/* f0ba2fc: 2652de18 */ addiu $s2,$s2,%lo(var8009de18)
/* f0ba300: 0c008f4e */ jal func00023d38
/* f0ba304: 86440000 */ lh $a0,0x0($s2)
/* f0ba308: 0c008dda */ jal animGetNumFrames
/* f0ba308: 0c008dda */ jal modelGetNumAnimFrames
/* f0ba30c: 86440000 */ lh $a0,0x0($s2)
/* f0ba310: 8e780290 */ lw $t8,0x290($s3)
/* f0ba314: 2444ffff */ addiu $a0,$v0,-1
@ -12801,7 +12801,7 @@ Gfx *func0f0c07c8(Gfx *gdl)
}
}
if (animGetFrame(&g_Vars.currentplayer->animdata) >= func0001d1a0(&g_Vars.currentplayer->animdata)
if (modelGetCurAnimFrame(&g_Vars.currentplayer->model) >= func0001d1a0(&g_Vars.currentplayer->model)
&& g_Vars.currentplayer->redbloodfinished) {
if (g_Vars.currentplayer->deathanimfinished == false) {
g_Vars.currentplayer->deathanimfinished = true;
@ -14156,7 +14156,7 @@ glabel var7f1ad710
/* f0c2608: 0fc0a209 */ jal chrGetEquippedWeaponProp
/* f0c260c: 00002825 */ or $a1,$zero,$zero
/* f0c2610: afa20068 */ sw $v0,0x68($sp)
/* f0c2614: 0c00744f */ jal animGetId
/* f0c2614: 0c00744f */ jal modelGetAnimNum
/* f0c2618: 8e040020 */ lw $a0,0x20($s0)
/* f0c261c: afa20078 */ sw $v0,0x78($sp)
/* f0c2620: 0fc331ab */ jal playerGetCrouchPos
@ -14186,7 +14186,7 @@ glabel var7f1ad710
/* f0c267c: 8e040020 */ lw $a0,0x20($s0)
.L0f0c2680:
/* f0c2680: e7a20070 */ swc1 $f2,0x70($sp)
/* f0c2684: 0c00744f */ jal animGetId
/* f0c2684: 0c00744f */ jal modelGetAnimNum
/* f0c2688: e7a00074 */ swc1 $f0,0x74($sp)
/* f0c268c: 8fb80078 */ lw $t8,0x78($sp)
/* f0c2690: c7a00074 */ lwc1 $f0,0x74($sp)
@ -14518,7 +14518,7 @@ glabel var7f1ad744
/* f0c2ac8: afa70050 */ sw $a3,0x50($sp)
/* f0c2acc: afa60054 */ sw $a2,0x54($sp)
/* f0c2ad0: afa50058 */ sw $a1,0x58($sp)
/* f0c2ad4: 0c00744f */ jal animGetId
/* f0c2ad4: 0c00744f */ jal modelGetAnimNum
/* f0c2ad8: afa3005c */ sw $v1,0x5c($sp)
/* f0c2adc: afa20040 */ sw $v0,0x40($sp)
/* f0c2ae0: 0fc0e6a5 */ jal chrIsDead

4
src/game/game_0f09f0.c
View File

@ -4887,7 +4887,7 @@ glabel var7f1b2948
/* f0f4a2c: 0c007486 */ jal func0001d218
/* f0f4a30: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f4a34: afa2004c */ sw $v0,0x4c($sp)
/* f0f4a38: 0c00745f */ jal animGetFrame
/* f0f4a38: 0c00745f */ jal modelGetCurAnimFrame
/* f0f4a3c: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f4a40: 8fae004c */ lw $t6,0x4c($sp)
/* f0f4a44: 448e3000 */ mtc1 $t6,$f6
@ -4896,7 +4896,7 @@ glabel var7f1b2948
/* f0f4a50: 10000004 */ beqz $zero,.L0f0f4a64
/* f0f4a54: 46005081 */ sub.s $f2,$f10,$f0
.L0f0f4a58:
/* f0f4a58: 0c00745f */ jal animGetFrame
/* f0f4a58: 0c00745f */ jal modelGetCurAnimFrame
/* f0f4a5c: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f4a60: 46000086 */ mov.s $f2,$f0
.L0f0f4a64:

2
src/game/game_0fd660.c
View File

@ -574,7 +574,7 @@ s32 activemenuGetFirstBuddyIndex(void)
if (chr && chr->actiontype != ACT_DIE
&& chr->actiontype != ACT_DEAD
&& chr->prop
&& chr->animdata) {
&& chr->model) {
return i;
}
}

6
src/game/game_113220.c
View File

@ -53,7 +53,7 @@ u32 var80075c9c = 0x00000000;
void currentPlayerFlipAnimation(void)
{
g_Vars.currentplayer->animdata.anim->flip = !g_Vars.currentplayer->animdata.anim->flip;
g_Vars.currentplayer->model.anim->flip = !g_Vars.currentplayer->model.anim->flip;
}
void currentPlayerUpdateIdleHeadRoll(void)
@ -751,14 +751,14 @@ glabel func0f1140bc
void func0f11412c(f32 speed)
{
func0001deb0(&g_Vars.currentplayer->animdata, speed * 0.5f, 0);
func0001deb0(&g_Vars.currentplayer->model, speed * 0.5f, 0);
}
f32 func0f11416c(void)
{
if (g_Vars.currentplayer->unk03ac >= 0) {
f32 a = g_Vars.currentplayer->unk0198 * 0.012500001f + 0.004166667f;
f32 b = func0001d288(&g_Vars.currentplayer->animdata);
f32 b = func0001d288(&g_Vars.currentplayer->model);
if (b > 0) {
f32 c = b / (var80075c00[g_Vars.currentplayer->unk03ac].unk08 - var80075c00[g_Vars.currentplayer->unk03ac].unk04);

2
src/game/game_129900.c
View File

@ -347,7 +347,7 @@ void alertNearbyChrsToNoise(f32 *radius, struct coord *noisepos)
s32 i;
for (i = 0; i < g_NumChrsA; i++) {
if (g_ChrsA[i].animdata
if (g_ChrsA[i].model
&& chrGetTargetProp(&g_ChrsA[i]) == g_Vars.currentplayer->prop
&& g_ChrsA[i].prop
&& g_ChrsA[i].prop->type == PROPTYPE_CHR

2
src/game/game_167ae0.c
View File

@ -2648,7 +2648,7 @@ glabel var7f1b7868
/* f16a378: 00008025 */ or $s0,$zero,$zero
/* f16a37c: 44800000 */ mtc1 $zero,$f0
/* f16a380: 8484de18 */ lh $a0,%lo(var8009de18)($a0)
/* f16a384: 0c008dda */ jal animGetNumFrames
/* f16a384: 0c008dda */ jal modelGetNumAnimFrames
/* f16a388: e7a000c4 */ swc1 $f0,0xc4($sp)
/* f16a38c: 3c03800a */ lui $v1,%hi(var8009de10)
/* f16a390: 8c63de10 */ lw $v1,%lo(var8009de10)($v1)

4
src/game/game_190260.c
View File

@ -442,10 +442,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->aibot->unk0a4 = func0001ae44(chr->animdata);
chr->aibot->unk0a4 = func0001ae44(chr->model);
chr->aibot->unk0a8 = 0;
chr->aibot->unk0ac = 0;
chr->aibot->unk0b0 = func0001ae44(chr->animdata);
chr->aibot->unk0b0 = func0001ae44(chr->model);
chr->aibot->unk0b4 = 0;
chr->aibot->unk0b8 = 0;
func0f02e9a0(chr, 0);

2
src/game/game_1999b0.c
View File

@ -361,7 +361,7 @@ bool aibotDoFarsightThing(struct chrdata *chr, u32 arg1, struct coord *arg2, str
&& func0f06b39c(arg3, arg2, &oppprop->pos, func0f0278a4(oppchr))) {
func0f0a7d98(sp156, oppprop, -1);
if (oppchr->animdata && chrGetShield(oppchr) > 0) {
if (oppchr->model && chrGetShield(oppchr) > 0) {
func0f03ff2c(oppchr, &oppprop->pos, arg2, &sp172, &sp160, &sp168, &sp164);
}

2
src/game/game_19c990.c
View File

@ -4140,7 +4140,7 @@ void func0f1a0924(struct prop *prop)
sp56 = -2;
sp60 = -2;
func0f068018(obj->animdata, &sp56, &sp64, &sp60, &sp68);
func0f068018(obj->model, &sp56, &sp64, &sp60, &sp68);
for (i = 0; i < 4; i++) {
if (g_Vars.currentplayer->unk1630[i].prop == prop) {

6
src/game/propobj.c
View File

@ -28051,7 +28051,7 @@ glabel var7f1aa6ec
/* f07ea0c: 24010006 */ addiu $at,$zero,0x6
/* f07ea10: 13010016 */ beq $t8,$at,.L0f07ea6c
/* f07ea14: 00000000 */ sll $zero,$zero,0x0
/* f07ea18: 0c00745f */ jal animGetFrame
/* f07ea18: 0c00745f */ jal modelGetCurAnimFrame
/* f07ea1c: 01202025 */ or $a0,$t1,$zero
/* f07ea20: e7a00044 */ swc1 $f0,0x44($sp)
/* f07ea24: 0c007486 */ jal func0001d218
@ -28421,7 +28421,7 @@ glabel var7f1aa6ec
/* f07ef84: 0fc1979d */ jal func0f065e74
/* f07ef88: afa50034 */ sw $a1,0x34($sp)
.L0f07ef8c:
/* f07ef8c: 0c00745f */ jal animGetFrame
/* f07ef8c: 0c00745f */ jal modelGetCurAnimFrame
/* f07ef90: 8fa40254 */ lw $a0,0x254($sp)
/* f07ef94: e7a00044 */ swc1 $f0,0x44($sp)
/* f07ef98: 0c007486 */ jal func0001d218
@ -37848,7 +37848,7 @@ void propObjGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin)
*ymin = obj->geo->ymin;
*ymax = obj->geo->ymax;
} else {
*width = func0001af80(obj->animdata);
*width = func0001af80(obj->model);
*ymin = obj->geo->ymin;
*ymax = obj->geo->ymax;
}

4
src/game/splat.c
View File

@ -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 animGetFrame
/* f148c78: 0c00745f */ jal modelGetCurAnimFrame
/* 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 animGetFrame
/* f148ca0: 0c00745f */ jal modelGetCurAnimFrame
/* f148ca4: afa3004c */ sw $v1,0x4c($sp)
/* f148ca8: 10000061 */ beqz $zero,.L0f148e30
/* f148cac: 8fa3004c */ lw $v1,0x4c($sp)

4
src/include/game/chr/chr.h
View File

@ -11,7 +11,7 @@ u32 func0f01f264(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3, bo
void func0f01f378(void);
s32 chrsGetNumFree(void);
s16 getLowestUnusedChrId(void);
struct prop *func0f020b14(struct prop *prop, struct animdata *animdata, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
struct prop *func0f020b14(struct prop *prop, struct model *model, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
void func0f020d44(struct prop *prop, bool arg1);
u32 func0f021258(void);
void func0f02133c(struct chrdata *chr);
@ -75,7 +75,7 @@ f32 chrGetMaxDamage(struct chrdata *chr);
void chrAddHealth(struct chrdata *chr, f32 health);
f32 chrGetArmor(struct chrdata *chr);
void chrInit(struct prop *prop, u8 *ailist);
struct prop *func0f020cc8(struct animdata *animdata, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
struct prop *func0f020cc8(struct model *model, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
void propClearReferences(s32 propnum);
void func0f022084(struct chrdata *chr, s16 *room);
void func0f0220ac(struct chrdata *chr);

8
src/include/game/data/data_0083d0.h
View File

@ -32,10 +32,10 @@ extern u32 var800624e8;
extern u32 var800624ec;
extern u32 var800624f0;
extern u32 var800624f4;
extern struct animdata *g_TitleModel;
extern struct animdata *g_TitleModel2;
extern struct animdata *var80062508;
extern struct animdata *var8006250c;
extern struct model *g_TitleModel;
extern struct model *g_TitleModel2;
extern struct model *var80062508;
extern struct model *var8006250c;
extern u32 var80062530;
extern u32 var80062538;
extern u32 var80062560;

2
src/include/game/game_02cde0.h
View File

@ -7,7 +7,7 @@ u32 bodyGetRace(s32 bodynum);
bool bodyLoad(u32 bodynum);
u32 func0f02ce8c(void);
u32 func0f02d338(void);
struct animdata *func0f02d36c(u32 bodynum, u32 arg1, u32 arg2);
struct model *func0f02d36c(u32 bodynum, u32 arg1, u32 arg2);
u32 func0f02d3f8(void);
u32 bodyGetHead(u32 bodynum);
u32 func0f02d4fc(void);

6
src/include/game/game_0b28d0.h
View File

@ -6,9 +6,9 @@
u32 func0f0b28d0(void);
void func0f0b2904(void);
u32 func0f0b2b64(void);
struct animdata *func0f0b30ac(void *modelfiledata);
void modelFree(struct animdata *animdata);
struct animdata *func0f0b3280(void *modelfiledata);
struct model *func0f0b30ac(void *modelfiledata);
void modelFree(struct model *model);
struct model *func0f0b3280(void *modelfiledata);
u32 func0f0b32a0(void);
struct anim *func0f0b32e4(void);
u32 func0f0b3338(void);

2
src/include/game/propobj.h
View File

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

50
src/include/lib/lib_1a500.h
View File

@ -14,20 +14,20 @@ u32 func0001a740(void);
u32 func0001a784(void);
u32 func0001a7cc(void);
u32 func0001a85c(void);
void *func0001a91c(struct animdata08 *arg0, s32 arg1);
void *func0001a91c(struct model08 *arg0, s32 arg1);
struct modelthing *func0001a9bc(void *modelfiledata, s32 arg1);
u32 func0001a9e8(void);
struct animdata10 *func0001aa1c(struct animdata *animdata, void *arg1);
struct model10 *func0001aa1c(struct model *model, void *arg1);
u32 func0001ab0c(void);
u32 func0001abc4(void);
void func0001ad0c(struct animdata *animdata, struct coord *coord);
void func0001ad34(struct animdata *animdata, struct coord *coord);
void func0001ad0c(struct model *model, struct coord *coord);
void func0001ad34(struct model *model, struct coord *coord);
u32 func0001ad5c(void);
f32 func0001ae44(struct animdata *animdata);
void func0001ae90(struct animdata *animdata, f32 arg1);
void func0001af58(struct animdata *animdata, f32 arg1);
void func0001af64(struct animdata *animdata, f32 arg1);
f32 func0001af80(struct animdata *animdata);
f32 func0001ae44(struct model *model);
void func0001ae90(struct model *model, f32 arg1);
void func0001af58(struct model *model, f32 arg1);
void func0001af64(struct model *model, f32 arg1);
f32 func0001af80(struct model *model);
u32 func0001af98(void);
f32 func0001afe8(f32 arg0, f32 distance, f32 arg2);
u32 func0001b07c(void);
@ -50,27 +50,27 @@ u32 func0001cc20(void);
u32 func0001cd18(void);
u32 func0001ce64(void);
u32 func0001cebc(void);
u32 animGetId(struct animdata *animdata);
bool animIsFlipped(struct animdata *animdata);
f32 animGetFrame(struct animdata *animdata);
f32 func0001d1a0(struct animdata *animdata);
s32 func0001d218(struct animdata *animdata);
f32 func0001d260(struct animdata *animdata);
f32 func0001d288(struct animdata *animdata);
u32 modelGetAnimNum(struct model *model);
bool modelIsFlipped(struct model *model);
f32 modelGetCurAnimFrame(struct model *model);
f32 func0001d1a0(struct model *model);
s32 func0001d218(struct model *model);
f32 func0001d260(struct model *model);
f32 func0001d288(struct model *model);
u32 func0001d320(void);
u32 func0001d4fc(void);
u32 func0001d62c(void);
u32 func0001db94(struct animdata *animdata);
void func0001dbfc(struct animdata *animdata, s32 arg1, u32 arg2, f32 arg3, f32 arg4, f32 arg5);
void func0001dccc(struct animdata *animdata, s32 animnum, s32 flip, f32 fstartframe, f32 arg4, f32 arg5);
u32 func0001db94(struct model *model);
void func0001dbfc(struct model *model, s32 arg1, u32 arg2, f32 arg3, f32 arg4, f32 arg5);
void func0001dccc(struct model *model, s32 animnum, s32 flip, f32 fstartframe, f32 arg4, f32 arg5);
u32 func0001dd90(void);
void func0001ddec(struct animdata *animdata, f32 arg1, f32 arg2);
void func0001de1c(struct animdata *animdata, f32 arg1);
void func0001ddec(struct model *model, f32 arg1, f32 arg2);
void func0001de1c(struct model *model, f32 arg1);
u32 func0001de98(void);
void func0001deb0(struct animdata *animdata, f32 speed, f32 startframe);
void func0001df04(struct animdata *animdata, f32 arg1, f32 arg2);
void func0001dfac(struct animdata *animdata, f32 arg1, f32 arg2);
void func0001e000(struct animdata *animdata, void *callback);
void func0001deb0(struct model *model, f32 speed, f32 startframe);
void func0001df04(struct model *model, f32 arg1, f32 arg2);
void func0001dfac(struct model *model, f32 arg1, f32 arg2);
void func0001e000(struct model *model, void *callback);
u32 func0001e018(void);
u32 func0001e14c(void);
u32 func0001e29c(void);

2
src/include/lib/lib_233c0.h
View File

@ -6,7 +6,7 @@
u32 func000233c0(void);
u32 func00023640(void);
void func0002373c(void);
s32 animGetNumFrames(s16 anim_id);
s32 modelGetNumAnimFrames(s16 anim_id);
u32 func00023794(void);
u32 func000237dc(void);
u32 func000237e8(void);

20
src/include/types.h
View File

@ -125,26 +125,26 @@ struct anim {
/*0x88*/ u32 animscale;
};
struct animdata08_00 {
struct model08_00 {
u16 unk00;
};
struct animdata08 {
struct animdata08_00 *unk00;
struct model08 {
struct model08_00 *unk00;
};
struct animdata10 {
struct model10 {
u32 unk00;
f32 ground;
};
struct animdata {
struct model {
/*0x00*/ u8 unk00;
/*0x01*/ u8 unk01;
/*0x04*/ struct chrdata *chr;
/*0x08*/ struct animdata08 *unk08;
/*0x08*/ struct model08 *unk08;
/*0x0c*/ u32 unk0c;
/*0x10*/ struct animdata10 *unk10;
/*0x10*/ struct model10 *unk10;
/*0x14*/ f32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
@ -584,7 +584,7 @@ struct chrdata {
/*0x014*/ u32 hidden;
/*0x018*/ u32 chrflags;
/*0x01c*/ struct prop *prop;
/*0x020*/ struct animdata *animdata;
/*0x020*/ struct model *model;
/*0x024*/ f32 chrwidth;
/*0x028*/ f32 chrheight;
@ -864,7 +864,7 @@ struct defaultobj {
/*0x0c*/ u32 flags2;
/*0x10*/ u32 flags3;
/*0x14*/ struct prop *prop;
/*0x18*/ struct animdata *animdata;
/*0x18*/ struct model *model;
/*0x1c*/ f32 realrot[9];
/*0x40*/ u32 hidden;
/*0x44*/ struct geo *geo;
@ -1911,7 +1911,7 @@ struct player {
/*0x0428*/ struct coord standlook[2];
/*0x0440*/ struct coord standup[2];
/*0x0458*/ s32 standcnt;
/*0x045c*/ struct animdata animdata;
/*0x045c*/ struct model model;
/*0x0480*/ struct eyespy *eyespy;
/*0x0484*/ u32 unk0484;
/*0x0488*/ u32 unk0488;

46
src/lib/lib_1a500.c
View File

@ -3551,28 +3551,28 @@ glabel func0001cebc
/* 1d138: 00000000 */ sll $zero,$zero,0x0
);
u32 animGetId(struct animdata *animdata)
u32 modelGetAnimNum(struct model *model)
{
if (animdata->anim) {
return animdata->anim->animnum;
if (model->anim) {
return model->anim->animnum;
}
return 0;
}
bool animIsFlipped(struct animdata *animdata)
bool modelIsFlipped(struct model *model)
{
if (animdata->anim) {
return animdata->anim->flip;
if (model->anim) {
return model->anim->flip;
}
return false;
}
f32 animGetFrame(struct animdata *animdata)
f32 modelGetCurAnimFrame(struct model *model)
{
if (animdata->anim) {
return animdata->anim->frame;
if (model->anim) {
return model->anim->frame;
}
return 0;
@ -3597,7 +3597,7 @@ glabel func0001d1a0
.L0001d1d8:
/* 1d1d8: 10800007 */ beqz $a0,.L0001d1f8
/* 1d1dc: 00000000 */ sll $zero,$zero,0x0
/* 1d1e0: 0c008dda */ jal animGetNumFrames
/* 1d1e0: 0c008dda */ jal modelGetNumAnimFrames
/* 1d1e4: 00000000 */ sll $zero,$zero,0x0
/* 1d1e8: 244effff */ addiu $t6,$v0,-1
/* 1d1ec: 448e2000 */ mtc1 $t6,$f4
@ -3624,11 +3624,11 @@ glabel func0001d218
/* 1d224: 00001025 */ or $v0,$zero,$zero
/* 1d228: 11c00009 */ beqz $t6,.L0001d250
/* 1d22c: 00000000 */ sll $zero,$zero,0x0
/* 1d230: 0c00744f */ jal animGetId
/* 1d230: 0c00744f */ jal modelGetAnimNum
/* 1d234: 00000000 */ sll $zero,$zero,0x0
/* 1d238: 00022400 */ sll $a0,$v0,0x10
/* 1d23c: 00047c03 */ sra $t7,$a0,0x10
/* 1d240: 0c008dda */ jal animGetNumFrames
/* 1d240: 0c008dda */ jal modelGetNumAnimFrames
/* 1d244: 01e02025 */ or $a0,$t7,$zero
/* 1d248: 10000002 */ beqz $zero,.L0001d254
/* 1d24c: 8fbf0014 */ lw $ra,0x14($sp)
@ -3730,13 +3730,13 @@ glabel func0001d320
/* 1d37c: 00046403 */ sra $t4,$a0,0x10
/* 1d380: 01802025 */ or $a0,$t4,$zero
/* 1d384: a7a50026 */ sh $a1,0x26($sp)
/* 1d388: 0c008dda */ jal animGetNumFrames
/* 1d388: 0c008dda */ jal modelGetNumAnimFrames
/* 1d38c: afa60020 */ sw $a2,0x20($sp)
/* 1d390: 87a50026 */ lh $a1,0x26($sp)
/* 1d394: afa2001c */ sw $v0,0x1c($sp)
/* 1d398: 00052400 */ sll $a0,$a1,0x10
/* 1d39c: 00046c03 */ sra $t5,$a0,0x10
/* 1d3a0: 0c008dda */ jal animGetNumFrames
/* 1d3a0: 0c008dda */ jal modelGetNumAnimFrames
/* 1d3a4: 01a02025 */ or $a0,$t5,$zero
/* 1d3a8: 8fa60020 */ lw $a2,0x20($sp)
/* 1d3ac: 8fae001c */ lw $t6,0x1c($sp)
@ -3780,7 +3780,7 @@ glabel func0001d320
/* 1d434: 00403025 */ or $a2,$v0,$zero
/* 1d438: a7a50026 */ sh $a1,0x26($sp)
.L0001d43c:
/* 1d43c: 0c008dda */ jal animGetNumFrames
/* 1d43c: 0c008dda */ jal modelGetNumAnimFrames
/* 1d440: afa60020 */ sw $a2,0x20($sp)
/* 1d444: 8fa60020 */ lw $a2,0x20($sp)
/* 1d448: 87a50026 */ lh $a1,0x26($sp)
@ -3803,7 +3803,7 @@ glabel func0001d320
.L0001d48c:
/* 1d48c: 0004c403 */ sra $t8,$a0,0x10
/* 1d490: 03002025 */ or $a0,$t8,$zero
/* 1d494: 0c008dda */ jal animGetNumFrames
/* 1d494: 0c008dda */ jal modelGetNumAnimFrames
/* 1d498: afa60020 */ sw $a2,0x20($sp)
/* 1d49c: 8fa60020 */ lw $a2,0x20($sp)
/* 1d4a0: 00c2001a */ div $zero,$a2,$v0
@ -3824,7 +3824,7 @@ glabel func0001d320
.L0001d4d4:
/* 1d4d4: 00052400 */ sll $a0,$a1,0x10
/* 1d4d8: 0004cc03 */ sra $t9,$a0,0x10
/* 1d4dc: 0c008dda */ jal animGetNumFrames
/* 1d4dc: 0c008dda */ jal modelGetNumAnimFrames
/* 1d4e0: 03202025 */ or $a0,$t9,$zero
/* 1d4e4: 2446ffff */ addiu $a2,$v0,-1
.L0001d4e8:
@ -4484,7 +4484,7 @@ glabel func0001de1c
/* 1de38: 50800010 */ beqzl $a0,.L0001de7c
/* 1de3c: 3c01bf80 */ lui $at,0xbf80
/* 1de40: afa3001c */ sw $v1,0x1c($sp)
/* 1de44: 0c008dda */ jal animGetNumFrames
/* 1de44: 0c008dda */ jal modelGetNumAnimFrames
/* 1de48: e7ac0024 */ swc1 $f12,0x24($sp)
/* 1de4c: 244effff */ addiu $t6,$v0,-1
/* 1de50: 448e2000 */ mtc1 $t6,$f4
@ -4569,7 +4569,7 @@ glabel func0001df04
/* 1df40: e7ae0028 */ swc1 $f14,0x28($sp)
/* 1df44: e7ac0024 */ swc1 $f12,0x24($sp)
/* 1df48: afa70020 */ sw $a3,0x20($sp)
/* 1df4c: 0c008dda */ jal animGetNumFrames
/* 1df4c: 0c008dda */ jal modelGetNumAnimFrames
/* 1df50: afa3001c */ sw $v1,0x1c($sp)
/* 1df54: 44822000 */ mtc1 $v0,$f4
/* 1df58: 8fa3001c */ lw $v1,0x1c($sp)
@ -5798,7 +5798,7 @@ glabel func0001ee18
/* 1f0a0: c6140060 */ lwc1 $f20,0x60($s0)
/* 1f0a4: 86040000 */ lh $a0,0x0($s0)
/* 1f0a8: e7b20088 */ swc1 $f18,0x88($sp)
/* 1f0ac: 0c008dda */ jal animGetNumFrames
/* 1f0ac: 0c008dda */ jal modelGetNumAnimFrames
/* 1f0b0: e7b0008c */ swc1 $f16,0x8c($sp)
/* 1f0b4: 2458ffff */ addiu $t8,$v0,-1
/* 1f0b8: 44985000 */ mtc1 $t8,$f10
@ -5819,7 +5819,7 @@ glabel func0001ee18
.L0001f0f4:
/* 1f0f4: 86040000 */ lh $a0,0x0($s0)
/* 1f0f8: e7b20088 */ swc1 $f18,0x88($sp)
/* 1f0fc: 0c008dda */ jal animGetNumFrames
/* 1f0fc: 0c008dda */ jal modelGetNumAnimFrames
/* 1f100: e7b0008c */ swc1 $f16,0x8c($sp)
/* 1f104: 2459ffff */ addiu $t9,$v0,-1
/* 1f108: 44993000 */ mtc1 $t9,$f6
@ -6138,7 +6138,7 @@ glabel func0001f314
/* 1f56c: c6140060 */ lwc1 $f20,0x60($s0)
/* 1f570: 86040000 */ lh $a0,0x0($s0)
/* 1f574: e7b20088 */ swc1 $f18,0x88($sp)
/* 1f578: 0c008dda */ jal animGetNumFrames
/* 1f578: 0c008dda */ jal modelGetNumAnimFrames
/* 1f57c: e7b0008c */ swc1 $f16,0x8c($sp)
/* 1f580: 2458ffff */ addiu $t8,$v0,-1
/* 1f584: 44983000 */ mtc1 $t8,$f6
@ -6159,7 +6159,7 @@ glabel func0001f314
.L0001f5c0:
/* 1f5c0: 86040000 */ lh $a0,0x0($s0)
/* 1f5c4: e7b20088 */ swc1 $f18,0x88($sp)
/* 1f5c8: 0c008dda */ jal animGetNumFrames
/* 1f5c8: 0c008dda */ jal modelGetNumAnimFrames
/* 1f5cc: e7b0008c */ swc1 $f16,0x8c($sp)
/* 1f5d0: 2459ffff */ addiu $t9,$v0,-1
/* 1f5d4: 44994000 */ mtc1 $t9,$f8

2
src/lib/lib_233c0.c
View File

@ -287,7 +287,7 @@ glabel func0002373c
);
GLOBAL_ASM(
glabel animGetNumFrames
glabel modelGetNumAnimFrames
/* 23768: 00047400 */ sll $t6,$a0,0x10
/* 2376c: 000e7c03 */ sra $t7,$t6,0x10
/* 23770: 3c188006 */ lui $t8,%hi(var8005f00c)