Decompile scenarioBriefcaseCallback04, scenarioHillCallback04, scenarioHackerCallback04 and scenarioPopacapCallback04

This commit is contained in:
Ryan Dwyer
2020-01-07 23:00:18 +10:00
parent f7c6857c59
commit 05b237ee1b
6 changed files with 240 additions and 229 deletions
+1 -1
View File
@@ -131,7 +131,7 @@ u32 scenarioHackerCallback1c(void);
s32 scenarioHackerCallback20(s32 value);
bool scenarioHackerCallback24(void *arg0, struct prop *prop);
u32 scenarioHackerCallback28(void);
u32 func0f1843d4(void);
void func0f1843d4(void);
void scenarioPopacapCallback04(void);
void scenarioPopacapCallback0c(void);
u32 scenarioPopacapCallback28(void);
+2 -7
View File
@@ -824,16 +824,11 @@ extern u32 var800abdc8;
extern u32 var800ac0e8;
extern u32 var800ac0f8;
extern u32 var800ac108;
extern s16 var800ac110[];
extern u32 var800ac118;
extern u32 var800ac11c;
extern u32 var800ac120;
extern u32 var800ac128;
extern u32 var800ac134;
extern u32 var800ac140;
extern struct scenariodata g_ScenarioData;
extern u32 var800ac150;
extern struct prop *var800ac168[];
extern u32 var800ac188;
extern u32 var800ac24c;
extern u32 var800ac258;
extern u32 var800ac2c0;
extern u32 var800ac328;
+54
View File
@@ -4365,4 +4365,58 @@ struct var800ac500 {
u8 propindex;
};
struct scenariodata_combat {
u32 unk00;
u32 unk04;
u32 unk08;
u16 unk0c;
s16 unk0e[1]; // possibly for a different scenario - see mpGetNumTeammatesInRoomDoingSomething
};
struct scenariodata_briefcase {
u32 unk00;
u32 unk04;
};
struct scenariodata_hacker {
u32 unk00;
};
struct scenariodata_popacap {
u32 unk00;
};
struct scenariodata_hill {
/*0x800ac110*/ u32 unk00;
/*0x800ac114*/ s16 unk04;
/*0x800ac116*/ s16 unk06;
/*0x800ac118*/ s16 unk08;
/*0x800ac11a*/ s16 unk0a;
/*0x800ac11c*/ s16 unk0c;
/*0x800ac11e*/ s16 unk0e;
/*0x800ac120*/ s16 unk10;
/*0x800ac122*/ s16 unk12[9];
/*0x800ac134*/ f32 unk24;
/*0x800ac138*/ f32 unk28;
/*0x800ac13c*/ f32 unk2c;
/*0x800ac140*/ f32 unk30;
/*0x800ac144*/ f32 unk34;
/*0x800ac148*/ f32 unk38;
};
struct scenariodata_capture {
u32 unk00;
};
struct scenariodata {
union {
struct scenariodata_combat combat;
struct scenariodata_briefcase briefcase;
struct scenariodata_hacker hacker;
struct scenariodata_popacap popacap;
struct scenariodata_hill hill;
struct scenariodata_capture capture;
};
};
#endif