mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-27 06:44:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to decompile chrTickRobotAttack

Browse Source
This commit is contained in:
Ryan Dwyer
2021-05-27 18:25:44 +10:00
parent 44fad9b971
commit 5368c4d386
5 changed files with 169 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/chr/chr.c
+2 -2
View File
@@ -4469,8 +4469,8 @@ void chrInit(struct prop *prop, u8 *ailist)
chr->gunrotx[0] = 0;
chr->gunroty[1] = 0;
chr->gunrotx[1] = 0;
chr->unk348 = 0;
chr->unk34c = 0;
chr->unk348[0] = 0;
chr->unk348[1] = 0;
chr->onladder = 0;
chr->laddernormal.x = 0;
chr->laddernormal.y = 0;
src/game/chr/chraction.c
+156 -16
View File
@@ -17700,22 +17700,22 @@ void robotAttack(struct chrdata *chr)
{
u32 numshots = random() % 20;
if (chr->unk348 && chr->unk34c) {
if (chr->unk348[0] && chr->unk348[1]) {
chr->actiontype = ACT_ROBOTATTACK;
chr->unk348->beam->age = -1;
chr->unk348->unk00 = random() % 3;
chr->unk348->unk01 = 0;
chr->unk348->unk08 = -1;
chr->unk348->unk0c = 0.85f;
chr->unk348[0]->beam->age = -1;
chr->unk348[0]->unk00 = random() % 3;
chr->unk348[0]->unk01 = 0;
chr->unk348[0]->unk08 = -1;
chr->unk348[0]->unk0c = 0.85f;
if ((lvGetDifficulty() == DIFF_PA) * 0.2f) {
chr->unk348->unk10 = 2.0f;
chr->unk348[0]->unk10 = 2.0f;
} else {
chr->unk348->unk10 = 1.0f;
chr->unk348[0]->unk10 = 1.0f;
}
chr->unk348->unk14 = 0.0f;
chr->unk348[0]->unk14 = 0.0f;
chr->act_robotattack.pos[0].x = 0.0f;
chr->act_robotattack.pos[0].y = 0.0f;
@@ -17726,13 +17726,13 @@ void robotAttack(struct chrdata *chr)
chr->act_robotattack.guntype[0] = 90;
chr->act_robotattack.firing[0] = false;
chr->unk34c->beam->age = -1;
chr->unk34c->unk00 = random() % 3;
chr->unk34c->unk01 = 0;
chr->unk34c->unk08 = -1;
chr->unk34c->unk0c = 0.85f;
chr->unk34c->unk10 = 0.2f;
chr->unk34c->unk14 = 0.0f;
chr->unk348[1]->beam->age = -1;
chr->unk348[1]->unk00 = random() % 3;
chr->unk348[1]->unk01 = 0;
chr->unk348[1]->unk08 = -1;
chr->unk348[1]->unk0c = 0.85f;
chr->unk348[1]->unk10 = 0.2f;
chr->unk348[1]->unk14 = 0.0f;
chr->act_robotattack.guntype[1] = 90;
chr->act_robotattack.firing[1] = false;
@@ -18186,6 +18186,146 @@ glabel var7f1a91dc
/* f042ff8: 27bd0118 */ addiu $sp,$sp,0x118
);
// Mismatch: float regalloc near first atan2f and too much stack usage.
//void chrTickRobotAttack(struct chrdata *chr)
//{
// f32 f26 = 0;
// f32 f28 = 0;
// struct prop *targetprop = chrGetTargetProp(chr);
// bool firing;
// f32 f20;
// f32 f24;
// f32 invtheta = chrGetInverseTheta(chr);
// union modelrodata *rodata;
// f32 aimy;
// struct act_robotattack *act = &chr->act_robotattack;
// struct coord spe4;
// Mtxf spa4;
// s32 i;
// f32 xdiff;
// f32 zdiff;
//
// func0f0429d8(chr, 0.085f, invtheta);
//
// if (chr->model->filedata->type != &g_ModelTypeRobot) {
// act->finished = true;
// return;
// }
//
// for (i = 0; i < 2; i++) {
// bool empty = false;
//
// if (act->numshots[i] > 0) {
// chr->unk348[i]->unk01 = !(chr->unk348[i]->unk00 % 3);
// firing = !(chr->unk348[i]->unk00 % 2);
// } else {
// chr->unk348[i]->unk01 = 0;
// firing = false;
// }
//
// act->firing[i] = firing;
//
// if (act->numshots[0] <= 0 && act->numshots[1] <= 0) {
// empty = true;
//
// if (ABS(chr->gunroty[0]) < 0.03f
// && ABS(chr->gunrotx[0]) < 0.03f
// && ABS(chr->gunroty[1]) < 0.03f
// && ABS(chr->gunrotx[1]) < 0.03f) {
// act->finished = true;
// }
// }
//
// if (!empty) {
// aimy = targetprop->pos.y - 20;
// rodata = modelGetPartRodata(chr->model->filedata, (i ? MODELPART_ROBOT_0000 : MODELPART_ROBOT_0001));
//
// act->pos[i].x = rodata->position.pos.x;
// act->pos[i].y = rodata->position.pos.y - 300;
// act->pos[i].z = rodata->position.pos.z;
//
// func00016374(invtheta, &spa4);
// func00015b14(&spa4, &act->pos[i], &spe4);
//
// spe4.x *= chr->model->scale;
// spe4.y *= chr->model->scale;
// spe4.z *= chr->model->scale;
//
// act->pos[i].x = chr->prop->pos.x + spe4.x;
// act->pos[i].y = chr->prop->pos.y + spe4.y;
// act->pos[i].z = chr->prop->pos.z + spe4.z;
//
// f26 = atan2f(targetprop->pos.x - act->pos[i].x, targetprop->pos.z - act->pos[i].z) - invtheta;
//
// if (f26 < 0.0f) {
// f26 += M_BADTAU;
// }
//
// if (f26 > M_BADPI) {
// f26 -= M_BADTAU;
// }
//
// if (f26 < -0.524f) {
// f26 = -0.524f;
// }
//
// if (f26 > 0.524f) {
// f26 = 0.524f;
// }
//
// xdiff = targetprop->pos.x - act->pos[i].x;
// zdiff = targetprop->pos.z - act->pos[i].z;
// f28 = M_BADTAU - atan2f(aimy - act->pos[i].y, sqrtf(xdiff * xdiff + zdiff * zdiff));
//
// if (f28 > M_BADPI) {
// f28 -= M_BADTAU;
// }
//
// if (f28 < -0.524f) {
// f28 = -0.524f;
// }
//
// if (f28 > 0.524f) {
// f28 = 0.524f;
// }
// }
//
// chr->gunroty[i] += (f26 - chr->gunroty[i]) * 0.15f;
// chr->gunrotx[i] += (f28 - chr->gunrotx[i]) * 0.15f;
//
// if (!empty) {
// if (firing) {
// f24 = chr->gunrotx[i];
// f20 = chr->gunroty[i];
//
// if (f24 < 0.0f) {
// f24 += M_BADTAU;
// }
//
// if (f20 < 0.0f) {
// f20 += M_BADTAU;
// }
//
// f20 += invtheta;
//
// if (f20 >= M_BADTAU) {
// f20 -= M_BADTAU;
// }
//
// act->dir[i].x = sinf(f20) * cosf(f24);
// act->dir[i].y = -sinf(f24);
// act->dir[i].z = cosf(f20) * cosf(f24);
//
// robotSetMuzzleFlash(chr, i, true);
//
// act->numshots[i]--;
// }
//
// chr->unk348[i]->unk00++;
// }
// }
//}
void chrTickAttack(struct chrdata *chr)
{
struct model *model = chr->model;
src/game/game_02cde0.c
+6 -6
View File
@@ -776,12 +776,12 @@ void chrUnpack(s32 stagenum, struct packedchr *packed, s32 cmdindex)
chr->chrheight = 185;
chr->chrwidth = 30;
} else if (bodynum == BODY_CHICROB) {
chr->unk348 = malloc(sizeof(struct fireslotthing), MEMPOOL_STAGE);
chr->unk34c = malloc(sizeof(struct fireslotthing), MEMPOOL_STAGE);
chr->unk348->beam = malloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE);
chr->unk34c->beam = malloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE);
chr->unk348->beam->age = -1;
chr->unk34c->beam->age = -1;
chr->unk348[0] = malloc(sizeof(struct fireslotthing), MEMPOOL_STAGE);
chr->unk348[1] = malloc(sizeof(struct fireslotthing), MEMPOOL_STAGE);
chr->unk348[0]->beam = malloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE);
chr->unk348[1]->beam = malloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE);
chr->unk348[0]->beam->age = -1;
chr->unk348[1]->beam->age = -1;
chr->chrheight = 200;
chr->chrwidth = 42;
}
src/game/propobj.c
+2 -2
View File
@@ -46962,8 +46962,8 @@ Gfx *propsRenderBeams(Gfx *gdl)
struct chrdata *chr = prop->chr;
if (CHRRACE(chr) == RACE_ROBOT) {
gdl = func0f0acb90(gdl, chr->unk348->beam, true, true);
gdl = func0f0acb90(gdl, chr->unk34c->beam, true, true);
gdl = func0f0acb90(gdl, chr->unk348[0]->beam, true, true);
gdl = func0f0acb90(gdl, chr->unk348[1]->beam, true, true);
} else {
if (chr->fireslot[0] >= 0) {
gdl = func0f0acb90(gdl, &g_Fireslots[chr->fireslot[0]].beam, true, false);
src/include/types.h
+3 -4
View File
@@ -1205,7 +1205,7 @@ struct act_robotattack {
/*0x2c*/ struct coord pos[2];
/*0x44*/ struct coord dir[2];
/*0x5c*/ u32 guntype[2];
/*0x64*/ u32 numshots[2];
/*0x64*/ s32 numshots[2];
/*0x6c*/ u8 firing[2];
/*0x6e*/ u8 finished;
};
@@ -1426,8 +1426,7 @@ struct chrdata {
/*0x33a*/ u8 deaddropsplatsadded;
/*0x33b*/ s8 aimtesttimer60;
/*0x33c*/ struct coord lastdroppos;
/*0x348*/ struct fireslotthing *unk348;
/*0x34c*/ struct fireslotthing *unk34c;
/*0x348*/ struct fireslotthing *unk348[2];
/*0x350*/ struct chrdata *lastattacker;
/*0x354*/ s16 aipunchdodgelist;
/*0x356*/ s16 aishootingatmelist;
@@ -3645,7 +3644,7 @@ struct room {
struct fireslotthing {
/*0x00*/ u8 unk00;
/*0x01*/ u8 unk01;
/*0x01*/ s8 unk01;
/*0x04*/ struct beam *beam;
/*0x08*/ s32 unk08;
/*0x0c*/ f32 unk0c;