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

Attempt to decompile scenarioPacCallback24

This commit is contained in:
Ryan Dwyer 2020-01-11 11:20:03 +10:00
parent 338b102b6e
commit 825ce078cb
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/game/game_176d70.c
View File

@ -14763,6 +14763,34 @@ glabel scenarioPacCallback24
/* f184ebc: 00000000 */ sll $zero,$zero,0x0
);
// Mismatch because the game jumps to pac properties directly
// while decomp loads the base pac address then uses offsets.
//bool scenarioPacCallback24(s32 *displaylist, struct prop *prop)
//{
// if ((g_MpSetup.options & MPOPTION_SHOWONRADAR4) && g_ScenarioData.pac.victimindex >= 0) {
// s32 index = g_ScenarioData.pac.victimindex;
// struct prop *thing = g_MpPlayerChrs[g_ScenarioData.pac.victims[index]]->prop;
//
// if (thing == prop) {
// struct coord dist;
// dist.x = prop->pos.x - g_Vars.currentplayer->prop->pos.x;
// dist.y = prop->pos.y - g_Vars.currentplayer->prop->pos.y;
// dist.z = prop->pos.z - g_Vars.currentplayer->prop->pos.z;
//
// if (g_MpSetup.options & MPOPTION_TEAMSENABLED) {
// u32 colour = g_TeamColours[teamGetIndex(prop->chr->team)];
// *displaylist = func0f18e9ec(*displaylist, thing, &dist, colour, 0, 1);
// } else {
// *displaylist = func0f18e9ec(*displaylist, thing, &dist, 0xff0000, 0, 1);
// }
//
// return true;
// }
// }
//
// return false;
//}
GLOBAL_ASM(
glabel menudialog00184ec0
/* f184ec0: 27bdffe8 */ addiu $sp,$sp,-24

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

@ -141,7 +141,7 @@ void scenarioPacCallback10(void);
u32 scenarioPacCallback18(void);
void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 scenarioPacRadar(s32 value);
bool scenarioPacCallback24(void *arg0, struct prop *prop);
bool scenarioPacCallback24(s32 *displaylist, struct prop *prop);
u32 func0f184fb0(void);
u32 func0f18500c(void);
void scenarioCallback40(s32 *arg0);