mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-26 14:30:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to decompile func0f048398

Browse Source
This commit is contained in:
Ryan Dwyer
2020-12-29 18:34:25 +10:00
parent cc73906eb0
commit d9b1d4352d
5 changed files with 222 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/chr/chraction.c
+212 -6
View File
@@ -23478,8 +23478,8 @@ void func0f0482cc(u32 ailistid)
g_ChrsB[g_NumChrsB - 1].aireturnlist = -1;
}
u32 var80068454 = 0x00000000;
u32 var80068458 = 0x00000000;
u32 var80068454 = 0;
s32 var80068458 = 0;
u32 var8006845c = 0x01020408;
GLOBAL_ASM(
@@ -23942,6 +23942,212 @@ glabel func0f048398
/* f048a10: 27bd00e8 */ addiu $sp,$sp,0xe8
);
// Mismatch because it uses the stack differently.
//void func0f048398(void)
//{
// s32 numchrs = getNumChrs(); // e0
// s32 numalivewithpropflag80; // dc
// struct chrdata *spb8[10];
// struct chrdata *spa4[5]; // a4
// struct chrdata *sp7c[10]; // 7c
// s32 writeindex;
// s32 sp74;
// s32 numreapablewithpropflag80;
// s32 numalive;
// s32 s1len;
// s32 s2len;
// s32 i;
// s32 time60;
//
// var80062cb0 = 0;
// var80062cb4 = 0;
// var80062cb8 = 0;
// numalivewithpropflag80 = 0;
// var80062cbc = 0;
//
// // 400
// if (g_Vars.normmplayerisrunning == false) {
// for (i = 0; i < numchrs; i++) {
// struct chrdata *chr = &g_ChrsA[i]; // s0
//
// if (chr->model && chr->prop && chrIsDead(chr) == false) {
// struct prop *targetprop = chrGetTargetProp(chr);
//
// if (targetprop && (targetprop->type == PROPTYPE_CHR || targetprop->type == PROPTYPE_PLAYER)) {
// if ((targetprop->type == PROPTYPE_PLAYER
// && !(g_Vars.antiplayernum >= 0 && g_Vars.anti && g_Vars.anti->prop == targetprop)
// && chrCompareTeams(chr, targetprop->chr, COMPARE_ENEMIES))
// || CHRRACE(targetprop->chr) == RACE_EYESPY) {
// var80062cb0++;
//
// if (chr->lastvisibletarget60 < chr->lastseetarget60) {
// time60 = chr->lastseetarget60;
// } else {
// time60 = chr->lastvisibletarget60;
// }
//
// if (time60) {
// var80062cb4++;
//
// if (g_Vars.lvframe60 - time60 < 240) {
// var80062cb8++;
// var80062cbc++;
// }
// }
// }
// }
// }
// }
// }
//
// // 56c
// var80068454++;
//
// if (var80068454 > 10) {
// var80068454 = 0;
// }
//
// if (debug0f11eeb0()) {
// propPrintDangerous();
// }
//
// if (g_Vars.unk0004d2 >= 0) {
// func0f0482cc(g_Vars.unk0004d2 + 0xc00);
// g_Vars.unk0004d2 = -1;
// g_Vars.unk0004d3 = 1;
// }
//
// for (i = 0; i < g_NumChrsB; i++) {
// if (g_Vars.unk0004d3 == 0 || (g_ChrsB[i].hidden2 & CHRH2FLAG_0010)) {
// chrTick(&g_ChrsB[i]);
// }
// }
//
// // 634
// numalive = 0;
// s2len = 0;
//
// for (i = 0; i < numchrs; i++) {
// struct chrdata *chr = &g_ChrsA[i];
//
// // 664
// if (chr->model && chr->prop) {
// // 67c
// if (chr->actiontype != ACT_DEAD && chr->actiontype != ACT_DRUGGEDKO) {
// numalive++;
// }
//
// // 698
// if (chr->prop->flags & PROPFLAG_80) {
// // 6a0
// if (chr->actiontype != ACT_DEAD && chr->actiontype != ACT_DRUGGEDKO) {
// numalivewithpropflag80++;
// } else /*6bc*/ if (chr->actiontype == ACT_DRUGGEDKO) {
// if ((chr->chrflags & CHRCFLAG_KEEPCORPSEKO) == 0) {
// numreapablewithpropflag80++;
// }
// } else {
// numreapablewithpropflag80++;
// }
// }
//
// // 6e0
// if (chr->actiontype == ACT_DEAD
// || (chr->actiontype == ACT_DRUGGEDKO && (chr->chrflags & CHRCFLAG_KEEPCORPSEKO) == 0)) {
// if (chr->hidden2 & CHRH2FLAG_0080) {
// sp7c[s2len] = chr;
// s2len++;
//
// if (s2len >= 10) {
// writeindex = random() % s2len;
// chrFadeCorpse(sp7c[writeindex]);
// sp7c[writeindex] = sp7c[s2len - 1];
// s2len--;
// }
// }
// }
// }
// }
//
// // 790
// if (var80068458 < numalive) {
// var80068458 = numalive;
// }
//
// // 7b4
// sp74 = 5 - numalivewithpropflag80;
//
// // 7c8
// if (g_Vars.lvupdate240_60 > 6) {
// sp74 = (sp74 - g_Vars.lvupdate240_60) + 6;
// }
//
// // 7dc
// if (sp74 < 0) {
// sp74 = 0;
// }
//
// // 7ec
// if (numreapablewithpropflag80) {
// numreapablewithpropflag80 = 0;
// s1len = 0;
// s2len = 0;
//
// for (i = 0; i < numchrs; i++) {
// struct chrdata *chr = &g_ChrsA[i];
//
// if (chr->model) {
// if (chr->actiontype == ACT_DEAD
// || (chr->actiontype == ACT_DRUGGEDKO && chr->prop && (chr->chrflags & CHRCFLAG_KEEPCORPSEKO) == 0)) {
// if (chr->prop->flags & PROPFLAG_80) {
// if (chr->act_dead.fadetimer < 0 && !chr->act_dead.allowfade) {
// numreapablewithpropflag80++;
//
// if (sp74 < numreapablewithpropflag80 || chr->aibot) {
// chrFadeCorpse(chr);
// numreapablewithpropflag80--;
// } else {
// if (chr->act_dead.allowreap == 0) {
// spb8[s1len] = chr;
// s1len++;
//
// if (s1len >= 2) {
// writeindex = random() % s1len;
//
//
// chrEnableReap(spb8[writeindex]);
// spb8[writeindex] = spb8[s1len - 1];
// s1len--;
// }
// }
// }
// }
// } else {
// // 938
// if (chr->act_dead.allowreap == 0) {
// spa4[s2len] = chr;
// s2len++;
//
// if (s2len >= 5) {
// writeindex = random() % s2len;
//
// if (spa4[writeindex]->actiontype != ACT_DEAD);
// if (spa4[writeindex]->actiontype != ACT_DEAD) {
// chrBeginDead(spa4[writeindex]);
// }
//
// chrEnableReap(spa4[writeindex]);
// spa4[writeindex] = spa4[s2len - 1];
// s2len--;
// }
// }
// }
// }
// }
// }
// }
//}
bool chrSawTargetRecently(struct chrdata *chr)
{
if (chr->lastseetarget60 > 0 && g_Vars.lvframe60 - chr->lastseetarget60 < 600) {
@@ -24919,7 +25125,7 @@ bool chrSawInjury(struct chrdata *chr, u8 arg1)
} else if (saw_injury && arg1 == 1) {
struct chrdata *victim = chrFindById(chr, chr->chrseeshot);
if (victim && !chrCompareTeams(chr, victim, 1)) {
if (victim && !chrCompareTeams(chr, victim, COMPARE_FRIENDS)) {
saw_injury = false;
}
} else {
@@ -24940,7 +25146,7 @@ bool chrSawDeath(struct chrdata *chr, u8 arg1)
} else if (saw_death && arg1 == 1) {
struct chrdata *victim = chrFindById(chr, chr->chrseedie);
if (victim && !chrCompareTeams(chr, victim, 1)) {
if (victim && !chrCompareTeams(chr, victim, COMPARE_FRIENDS)) {
saw_death = false;
chr->chrseedie = -1;
}
@@ -25413,7 +25619,7 @@ bool chrCompareTeams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype)
return true;
}
if (checktype == 1) { // Return true if chrs are friends
if (checktype == COMPARE_FRIENDS) { // Return true if chrs are friends
if (g_Vars.normmplayerisrunning) {
if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) && chr2->team == chr1->team) {
return true;
@@ -25433,7 +25639,7 @@ bool chrCompareTeams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype)
return true;
}
}
} else if (checktype == 2) { // Return true if chrs are enemies
} else if (checktype == COMPARE_ENEMIES) { // Return true if chrs are enemies
if (g_Vars.normmplayerisrunning) {
if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) == 0 || chr2->team != chr1->team) {
return true;
src/game/chr/chraicommands.c
+4 -4
View File
@@ -6903,7 +6903,7 @@ glabel aiDetectEnemyOnSameFloor
// && chr->actiontype != ACT_DRUGGEDKO
// && chr->actiontype != ACT_DRUGGEDDROP
// && chr->actiontype != ACT_DRUGGEDCOMINGUP
// && chrCompareTeams(g_Vars.chrdata, chr, 2)
// && chrCompareTeams(g_Vars.chrdata, chr, COMPARE_ENEMIES)
// && (chr->hidden & CHRHFLAG_CLOAKED) == 0
// && (chr->chrflags & CHRCFLAG_HIDDEN) == 0
// && (chr->hidden & CHRHFLAG_40000000) == 0
@@ -6985,7 +6985,7 @@ bool aiDetectEnemy(void)
&& chr->actiontype != ACT_DRUGGEDKO
&& chr->actiontype != ACT_DRUGGEDDROP
&& chr->actiontype != ACT_DRUGGEDCOMINGUP
&& chrCompareTeams(g_Vars.chrdata, chr, 2)
&& chrCompareTeams(g_Vars.chrdata, chr, COMPARE_ENEMIES)
&& chr != g_Vars.chrdata
&& (chr->hidden & CHRHFLAG_CLOAKED) == 0
&& (chr->chrflags & CHRCFLAG_HIDDEN) == 0
@@ -8423,7 +8423,7 @@ bool aiSetTeamOrders(void)
if (chr && chr->model
&& !chrIsDead(chr)
&& chr->actiontype != ACT_DEAD
&& chrCompareTeams(g_Vars.chrdata, chr, true)
&& chrCompareTeams(g_Vars.chrdata, chr, COMPARE_FRIENDS)
&& g_Vars.chrdata->chrnum != chr->chrnum) {
if (chr->myaction == MA_COVERWAIT
|| chr->myaction == MA_NORMAL
@@ -8610,7 +8610,7 @@ bool aiIfChrInSquadronDoingAction(void)
if (chr && chr->model && chrIsDead(chr) == false &&
chr->actiontype != ACT_DEAD &&
chrCompareTeams(g_Vars.chrdata, chr, 1) &&
chrCompareTeams(g_Vars.chrdata, chr, COMPARE_FRIENDS) &&
g_Vars.chrdata->chrnum != chr->chrnum &&
chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum) < 3500 &&
chr->myaction == cmd->b2) {
src/include/commands.h
+1 -2
View File
@@ -2375,8 +2375,7 @@
/**
* Compares the current chr's chrpreset's team with our own.
*
* checktype 1 = if friendly
* checktype 2 = if enemies
* Checktype is expected to be COMPARE_FRIENDS or COMPARE_ENEMIES.
*/
#define if_compare_chrpresets_team(checktype, label) \
mkshort(0x010c), \
src/include/constants.h
+4
View File
@@ -436,6 +436,7 @@
// chr->hidden2
#define CHRH2FLAG_0001 0x0001
#define CHRH2FLAG_0002 0x0002 // Equivalent to OBJFLAG3_00020000
#define CHRH2FLAG_0010 0x0010
#define CHRH2FLAG_0040 0x0040
#define CHRH2FLAG_0080 0x0080
#define CHRH2FLAG_HEADSHOTTED 0x1000
@@ -498,6 +499,9 @@
#define COLOR_08_RED 0x08
#define COLOR_09_BLUE 0x09
#define COMPARE_FRIENDS 1
#define COMPARE_ENEMIES 2
// Control styles - 1.1, 1.2 etc
#define CONTROLMODE_11 0
#define CONTROLMODE_12 1
src/include/game/chr/chraction.h
+1 -1
View File
@@ -168,7 +168,7 @@ bool chrStartSkJump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4);
void chrTickSkJump(struct chrdata *chr);
void chrTick(struct chrdata *chr);
void func0f0482cc(u32 ailistid);
u32 func0f048398(void);
void func0f048398(void);
f32 chrGetAngleToPos(struct chrdata *chr, struct coord *pos);
u32 func0f048b78(void);
f32 func0f048cc0(struct chrdata *chr);