Sort out g_Briefing struct

This commit is contained in:
Ryan Dwyer
2020-10-17 14:03:25 +10:00
parent 706a5b96bb
commit e69571233f
7 changed files with 34 additions and 40 deletions
+1 -2
View File
@@ -579,7 +579,7 @@ extern u8 *g_GeCreditsData;
extern struct objective *g_Objectives[MAX_OBJECTIVES];
extern u32 g_ObjectiveStatuses[MAX_OBJECTIVES];
extern struct tag *g_TagsLinkedList;
extern struct objectivething *var8009d0b4;
extern struct briefingobj *g_BriefingObjs;
extern struct criteria_roomentered *g_RoomEnteredCriterias;
extern struct criteria_multiroomentered *g_MultiroomEnteredCriterias;
extern struct criteria_holograph *g_HolographCriterias;
@@ -641,7 +641,6 @@ extern char g_CheatMarqueeString[];
extern u32 var8009dfbc;
extern s32 var8009dfc0;
extern struct briefing g_Briefing;
extern u16 var8009dfe0[2];
extern struct missionconfig g_MissionConfig;
extern struct menu g_Menus[4];
extern struct menudata g_MenuData;
+5 -9
View File
@@ -1377,6 +1377,7 @@ struct briefingobj { // objtype 0x23
u32 unk00;
u32 type;
u32 text;
struct briefingobj *next;
};
struct padlockeddoorobj { // objtype 0x26
@@ -5126,8 +5127,10 @@ struct objective { // representation of setup file beginobjective macro
};
struct briefing {
u16 objectivenames[6]; // index 0 is the briefing, and the rest of objectives
u16 objectivedifficulties[6];
u16 briefingtextnum;
u16 objectivenames[6]; // index 0 is the briefing, and the rest are objectives
u16 objectivedifficulties[6]; // index 0 is unused
u16 langbank;
};
struct criteria_roomentered {
@@ -5152,13 +5155,6 @@ struct criteria_holograph {
struct criteria_holograph *next;
};
struct objectivething {
u32 unk00;
u32 unk04;
u32 name;
struct objectivething *next;
};
struct mppreset {
u16 name;
u32 confignum;