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

Decompile scenarioHtbKill

Browse Source
This commit is contained in:
Ryan Dwyer
2020-01-10 21:19:11 +10:00
parent cc312df15b
commit 48af4d190f
8 changed files with 71 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/game/game_176d70.h
+5 -5
View File
@@ -89,7 +89,7 @@ void scenarioHtbReset(void);
void scenarioHtbCallback10(void);
void scenarioHtbCallback14(struct chrdata *chr);
u32 scenarioHtbCallback18(void);
u32 scenarioHtbCallback1c(void);
void scenarioHtbKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 scenarioHtbCallback20(s32 value);
bool scenarioHtbCallback24(void *arg0, struct prop *prop);
u32 scenarioHtbCallback28(void);
@@ -98,7 +98,7 @@ s32 scenarioCtcCallback08(void);
void scenarioCtcCallback10(void);
void scenarioCtcCallback14();
void scenarioCtcReset(void);
u32 scenarioCtcCallback1c(void);
void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 scenarioCtcCallback20(s32 value);
bool scenarioCtcCallback24(void *arg0, struct prop *prop);
u32 scenarioCtcCallback28(void);
@@ -113,7 +113,7 @@ void scenarioKohInit(void);
void scenarioKohReset(void);
void scenarioKohCallback10(void);
u32 scenarioKohCallback18(void);
u32 scenarioKohCallback1c(void);
void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 scenarioKohCallback20(s32 value);
u32 func0f182aac(void);
bool scenarioKohCallback34(s16 arg0);
@@ -127,7 +127,7 @@ void scenarioHtmReset(void);
void scenarioHtmCallback10(void);
void scenarioHtmCallback14(struct chrdata *chr);
u32 scenarioHtmCallback18(void);
u32 scenarioHtmCallback1c(void);
void scenarioHtmKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 scenarioHtmCallback20(s32 value);
bool scenarioHtmCallback24(void *arg0, struct prop *prop);
u32 scenarioHtmCallback28(void);
@@ -139,7 +139,7 @@ void func0f1845bc(void);
u32 func0f1847b8(void);
void scenarioPacCallback10(void);
u32 scenarioPacCallback18(void);
u32 scenarioPacCallback1c(void);
void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 scenarioPacCallback20(s32 value);
bool scenarioPacCallback24(void *arg0, struct prop *prop);
u32 func0f184fb0(void);
src/include/gvars/gvars.h
+2 -2
View File
@@ -832,8 +832,8 @@ extern u32 var800ac390;
extern u32 var800ac3f8;
extern u32 var800ac460;
extern u32 var800ac4cc;
extern struct chrdata *g_MpPlayerChrs[4];
extern struct var800ac500 *var800ac500[4];
extern struct chrdata *g_MpPlayerChrs[12];
extern struct mpchr *var800ac500[12];
extern s32 g_MpNumPlayers;
extern struct mpsim g_MpSimulants[8];
extern u32 var800ac798[8];
src/include/types.h
+10 -48
View File
@@ -4015,27 +4015,23 @@ struct mpchr {
/*0x0e*/ u8 unk0e;
/*0x0f*/ u8 headnum;
/*0x10*/ u8 bodynum;
/*0x11*/ u8 unk11;
};
struct mpplayer {
/*0x00*/ struct mpchr base;
/*0x11*/ u8 team;
/*0x14*/ u32 displayoptions;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
/*0x24*/ s16 unk24[12];
/*0x3c*/ s16 unk3c;
/*0x3c*/ s16 unk3e;
/*0x40*/ u32 unk40;
/*0x44*/ u8 controlmode;
/*0x45*/ s8 unk45;
/*0x46*/ s8 unk46;
/*0x47*/ u8 unk47;
};
struct mpplayer {
/*0x00*/ struct mpchr base;
/*0x48*/ u16 options;
/*0x4c*/ u32 unk4c;
/*0x50*/ u32 unk50;
@@ -4063,19 +4059,6 @@ struct mpplayer {
struct mpsim {
/*0x00*/ struct mpchr base;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
/*0x40*/ u32 unk40;
/*0x44*/ u32 unk44;
/*0x48*/ u8 unk48;
};
@@ -4131,7 +4114,7 @@ struct mpscenario {
void (*unk10)(void);
void (*unk14)(struct chrdata *chr);
void *unk18;
void *unk1c;
void (*killfunc)(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 (*unk20)(s32 value);
bool (*unk24)(void *arg0, struct prop *prop);
void *unk28;
@@ -4354,27 +4337,6 @@ struct challenge {
/*0x18*/ u16 unk18;
};
struct var800ac500 {
u32 unk00;
u32 unk04;
u32 unk08;
u32 unk0c;
u8 unk10;
u8 propindex;
u32 unk14;
u32 unk18;
u32 unk1c;
u32 unk20;
u32 unk24;
u32 unk28;
u32 unk2c;
u32 unk30;
u32 unk34;
u32 unk38;
u16 unk3c;
s16 unk3e;
};
struct scenariodata_cbt {
u32 unk00;
u32 unk04;
@@ -4412,7 +4374,7 @@ struct scenariodata_htm {
/*0x800ac15c*/ u32 unk04c;
/*0x800ac160*/ u32 unk050;
/*0x800ac164*/ u32 unk054;
/*0x800ac168*/ struct prop *props[4];
/*0x800ac168*/ struct prop *props[4]; // probably a team list, not props
/*0x800ac178*/ u32 unk068;
/*0x800ac17c*/ u32 unk06c;
/*0x800ac180*/ u32 unk070;