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

Decompile chrGoposConsiderRestart

This commit is contained in:
Ryan Dwyer 2020-06-17 21:19:43 +10:00
parent 90238b1039
commit 2d4c6f6ed8
6 changed files with 43 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2657,7 +2657,7 @@ void chrInit(struct prop *prop, u8 *ailist)
chr->laddernormal.x = 0;
chr->laddernormal.y = 0;
chr->laddernormal.z = 0;
chr->unk32c_00 = 0;
chr->liftaction = 0;
chr->unk364 = 0;
chr->pouncebits = 0;
chr->specialdie = 0;

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

@ -9674,69 +9674,35 @@ glabel var7f1a8da8
/* f037218: 00000000 */ sll $zero,$zero,0x0
);
void chrSetField66To0(struct chrdata *chr)
void chrGoposClearRestartTtl(struct chrdata *chr)
{
chr->act_gopos.unk066 = 0;
chr->act_gopos.restartttl = 0;
}
GLOBAL_ASM(
glabel func0f037224
/* f037224: 27bdffe8 */ addiu $sp,$sp,-24
/* f037228: afbf0014 */ sw $ra,0x14($sp)
/* f03722c: 808e0068 */ lb $t6,0x68($a0)
/* f037230: 24010006 */ addiu $at,$zero,0x6
/* f037234: 51c10029 */ beql $t6,$at,.L0f0372dc
/* f037238: 8fbf0014 */ lw $ra,0x14($sp)
/* f03723c: 9082032c */ lbu $v0,0x32c($a0)
/* f037240: 24010003 */ addiu $at,$zero,0x3
/* f037244: 10410024 */ beq $v0,$at,.L0f0372d8
/* f037248: 24010001 */ addiu $at,$zero,0x1
/* f03724c: 50410023 */ beql $v0,$at,.L0f0372dc
/* f037250: 8fbf0014 */ lw $ra,0x14($sp)
/* f037254: 94820066 */ lhu $v0,0x66($a0)
/* f037258: 3c03800a */ lui $v1,%hi(g_MenuStack+0x212c)
/* f03725c: 1440000c */ bnez $v0,.L0f037290
/* f037260: 00000000 */ sll $zero,$zero,0x0
/* f037264: 0fc0dc49 */ jal func0f037124
/* f037268: afa40018 */ sw $a0,0x18($sp)
/* f03726c: 00021840 */ sll $v1,$v0,0x1
/* f037270: 2465012c */ addiu $a1,$v1,%lo(g_MenuStack+0x212c)
/* f037274: 3c010001 */ lui $at,0x1
/* f037278: 00a1082a */ slt $at,$a1,$at
/* f03727c: 14200002 */ bnez $at,.L0f037288
/* f037280: 8fa40018 */ lw $a0,0x18($sp)
/* f037284: 3405ffff */ dli $a1,0xffff
.L0f037288:
/* f037288: 10000013 */ beqz $zero,.L0f0372d8
/* f03728c: a4850066 */ sh $a1,0x66($a0)
.L0f037290:
/* f037290: 94639ffa */ lhu $v1,-0x6006($v1)
/* f037294: 0062082a */ slt $at,$v1,$v0
/* f037298: 1420000e */ bnez $at,.L0f0372d4
/* f03729c: 0043c023 */ subu $t8,$v0,$v1
/* f0372a0: 8c8f02d4 */ lw $t7,0x2d4($a0)
/* f0372a4: 2485002c */ addiu $a1,$a0,0x2c
/* f0372a8: 24860038 */ addiu $a2,$a0,0x38
/* f0372ac: 11e00005 */ beqz $t7,.L0f0372c4
/* f0372b0: 00000000 */ sll $zero,$zero,0x0
/* f0372b4: 0fc65d51 */ jal func0f197544
/* f0372b8: 00000000 */ sll $zero,$zero,0x0
/* f0372bc: 10000007 */ beqz $zero,.L0f0372dc
/* f0372c0: 8fbf0014 */ lw $ra,0x14($sp)
.L0f0372c4:
/* f0372c4: 0fc0e10f */ jal chrGoToPos
/* f0372c8: 90870065 */ lbu $a3,0x65($a0)
/* f0372cc: 10000003 */ beqz $zero,.L0f0372dc
/* f0372d0: 8fbf0014 */ lw $ra,0x14($sp)
.L0f0372d4:
/* f0372d4: a4980066 */ sh $t8,0x66($a0)
.L0f0372d8:
/* f0372d8: 8fbf0014 */ lw $ra,0x14($sp)
.L0f0372dc:
/* f0372dc: 27bd0018 */ addiu $sp,$sp,0x18
/* f0372e0: 03e00008 */ jr $ra
/* f0372e4: 00000000 */ sll $zero,$zero,0x0
);
void chrGoposConsiderRestart(struct chrdata *chr)
{
if (chr->act_gopos.waydata.mode != WAYMODE_CHEAP
&& chr->liftaction != LA_3
&& chr->liftaction != LA_1) {
if (chr->act_gopos.restartttl == 0) {
s32 value = func0f037124(chr) * 2 + 300;
if (value > 0xffff) {
value = 0xffff;
}
chr->act_gopos.restartttl = value;
} else if (chr->act_gopos.restartttl <= (u16)g_Vars.lvupdate240_60) {
if (chr->aibot) {
func0f197544(chr);
} else {
chrGoToPos(chr, &chr->act_gopos.pos, chr->act_gopos.rooms, chr->act_gopos.flags);
}
} else {
chr->act_gopos.restartttl -= (u16)g_Vars.lvupdate240_60;
}
}
}
GLOBAL_ASM(
glabel func0f0372e8
@ -9755,7 +9721,7 @@ glabel func0f0372e8
/* f037318: c7a60030 */ lwc1 $f6,0x30($sp)
/* f03731c: e4860070 */ swc1 $f6,0x70($a0)
/* f037320: c7a80034 */ lwc1 $f8,0x34($sp)
/* f037324: 0fc0dc87 */ jal chrSetField66To0
/* f037324: 0fc0dc87 */ jal chrGoposClearRestartTtl
/* f037328: e4880074 */ swc1 $f8,0x74($a0)
/* f03732c: 8fbf0014 */ lw $ra,0x14($sp)
/* f037330: 27bd0038 */ addiu $sp,$sp,0x38
@ -11378,7 +11344,7 @@ glabel chrGoToPos
// func0f0372e8(chr);
// chr->goposforce = -1;
// chr->sleep = 0;
// chr->unk32c_00 = 0;
// chr->liftaction = 0;
// chr->act_gopos.unk065 &= 0xff1f;
// func0f037088(chr, &auStack52[0], &auStack68[0]);
//
@ -11386,7 +11352,7 @@ glabel chrGoToPos
// g_Vars.normmplayerisrunning == 0 &&
// (prop->flags & (PROPFLAG_80 | PROPFLAG_40 | PROPFLAG_02)) == 0 &&
// func0f036c08(chr, &auStack52[0], &auStack68[0]) &&
// chr->unk32c_00 >= 0) {
// chr->liftaction >= 0) {
// func0f036ee4(chr, &chr->act_gopos.waydata, &auStack52[0], &prevpos);
// }
//
@ -24124,7 +24090,7 @@ glabel var7f1a9260
/* f045b38: 11400010 */ beqz $t2,.L0f045b7c
/* f045b3c: 00000000 */ sll $zero,$zero,0x0
.L0f045b40:
/* f045b40: 0fc0dc87 */ jal chrSetField66To0
/* f045b40: 0fc0dc87 */ jal chrGoposClearRestartTtl
/* f045b44: 00000000 */ sll $zero,$zero,0x0
/* f045b48: 8fab0030 */ lw $t3,0x30($sp)
/* f045b4c: 8e050004 */ lw $a1,0x4($s0)
@ -25184,7 +25150,7 @@ glabel func0f046648
s32 func0f046a30(struct chrdata *chr)
{
return (chr->actiontype == ACT_GOPOS || chr->actiontype == ACT_PATROL) && chr->unk32c_00 > 0;
return (chr->actiontype == ACT_GOPOS || chr->actiontype == ACT_PATROL) && chr->liftaction > 0;
}
s16 chrGoposGetNextPadNum(struct chrdata *chr)
@ -25240,7 +25206,7 @@ void chrTickGoPos(struct chrdata *chr)
chrGoToPos(chr, &chr->act_gopos.pos, chr->act_gopos.rooms, chr->act_gopos.flags);
}
func0f037224(chr); // related to lifts, may result in chrGoToPos being called
chrGoposConsiderRestart(chr);
chrGoposGetCurWaypointInfo(chr, &sp228pos, sp212rooms, &padflags);
// If cheap mode ended over 3 seconds ago, not multiplayer, not in view of

2
src/game/game_190260.c
View File

@ -306,7 +306,7 @@ glabel mpChrReset
// chr->weapons_held[0] = NULL;
// chr->weapons_held[1] = NULL;
// chr->unk178 = 0;
// chr->unk32c_00 = 0;
// chr->liftaction = 0;
// chr->inlift = 0;
// chr->unk364 = 0;
// chr->chrheight = 185;

4
src/include/constants.h
View File

@ -718,6 +718,10 @@
#define INVITEMTYPE_PROP 2
#define INVITEMTYPE_DUAL 3
// Lift actions
#define LA_1 1 // either waiting for lift or in lift
#define LA_3 3 // either waiting for lift or in lift
#define LANGBANK_AME 0x01
#define LANGBANK_ARCH 0x02
#define LANGBANK_ARK 0x03

6
src/include/game/chr/chraction.h
View File

@ -68,8 +68,8 @@ u32 func0f036c08(struct chrdata *chr, struct coord *arg1, s16 *rooms);
void func0f036ee4(struct chrdata *chr, struct waydata *waydata, struct coord *arg2, struct coord *prevpos);
void chrGoposGetCurWaypointInfo(struct chrdata *chr, struct coord *arg1, s16 *rooms, u32 *flags);
f32 func0f0370a8(struct chrdata *chr);
u32 func0f037124(void);
void func0f037224(struct chrdata *chr);
s32 func0f037124(struct chrdata *chr);
void chrGoposConsiderRestart(struct chrdata *chr);
void func0f0372e8(struct chrdata *chr);
void func0f03733c(struct chrdata *chr);
u32 func0f0373dc(void);
@ -222,7 +222,7 @@ void func0f03119c(struct chrdata *chr);
f32 chrGetShield(struct chrdata *chr);
void func0f036358(struct chrdata *chr, s32 arg1);
void func0f037088(struct chrdata *chr, struct coord *pos, s16 *rooms);
void chrSetField66To0(struct chrdata *chr);
void chrGoposClearRestartTtl(struct chrdata *chr);
s32 func0f037560(s32 arg0, s32 arg1, s32 arg2);
struct path *pathFindById(u32 path_id);
void chrRecordLastVisibleTargetTime(struct chrdata *chr);

4
src/include/types.h
View File

@ -521,7 +521,7 @@ struct act_gopos {
// ......xx = speed
/*0x065*/ u8 flags;
/*0x066*/ s16 unk066;
/*0x066*/ u16 restartttl;
/*0x068*/ struct waydata waydata;
/*0x0a8*/ s32 cheapend60; // lvframe60 time that the chr exited cheap method of wayfinding
/*0x0ac*/ f32 unk0ac;
@ -791,7 +791,7 @@ struct chrdata {
/*0x320*/ struct coord laddernormal;
/*0x32c*/
u8 unk32c_00 : 8;
u8 liftaction : 8;
u8 inlift : 1;
u8 pouncebits : 3;