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 scenarioCtcCallback28

This commit is contained in:
Ryan Dwyer 2020-01-11 13:11:33 +10:00
parent cbf8aaf1b9
commit 4e4d279775
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/game/game_176d70.c
View File

@ -11248,6 +11248,24 @@ glabel scenarioCtcCallback28
/* f1817fc: 00000000 */ sll $zero,$zero,0x0
);
//bool scenarioCtcCallback28(struct prop *prop, u32 *colour)
//{
// if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_DOOR) {
// if (prop->obj->type == OBJTYPE_WEAPON && prop->weapon->weapon_id == WEAPON_BRIEFCASE2) {
// u32 teamcolour = g_TeamColours[prop->weapon->team];
//
// colour[0] = teamcolour >> 24 & 0xff;
// colour[1] = teamcolour >> 16 & 0xff;
// colour[2] = teamcolour >> 8 & 0xff;
// colour[3] = 75;
//
// return true;
// }
// }
//
// return false;
//}
GLOBAL_ASM(
glabel func0f181800
/* f181800: 8c820000 */ lw $v0,0x0($a0)

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

@ -101,7 +101,7 @@ void scenarioCtcReset(void);
void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 scenarioCtcRadar(s32 value);
bool scenarioCtcCallback24(s32 *displaylist, struct prop *prop);
u32 scenarioCtcCallback28(void);
bool scenarioCtcCallback28(struct prop *prop, u32 *colour);
u32 func0f181800(void);
bool scenarioCtcCallback2c(f32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 *arg4);
s32 scenarioCtcCallback30(void);

5
src/include/types.h
View File

@ -646,6 +646,9 @@ struct weaponobj { // objtype 0x08
/*0x5a*/ u8 numtiles;
/*0x5b*/ u8 unk5b;
/*0x5c*/ u8 weapon_id;
/*0x5e*/ s16 unk5e;
/*0x60*/ s16 unk60;
/*0x62*/ s16 team;
};
struct singlemonitorobj { // objtype 0x0a
@ -4117,7 +4120,7 @@ struct mpscenario {
void (*killfunc)(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 (*radarfunc)(s32 value);
bool (*unk24)(void *arg0, struct prop *prop);
void *unk28;
bool (*unk28)(struct prop *prop, u32 *colour);
bool (*unk2c)(f32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 *arg4);
s32 (*unk30)(void);
bool (*unk34)(s16 arg0);