mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-12 11:42:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Introduce MAX_* and NUM_* constants

Browse Source
This commit is contained in:
Ryan Dwyer
2020-01-19 09:36:49 +10:00
parent fbeace08de
commit ee444daa77
18 changed files with 77 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/constants.h
+17 -6
View File
@@ -148,7 +148,6 @@
#define CHEAT_DMC 39
#define CHEAT_AR53 40
#define CHEAT_RCP45 41
#define NUM_CHEATS 42
#define CHEATFLAG_TIMED 0
#define CHEATFLAG_ALWAYSON 1
@@ -469,6 +468,13 @@
#define MA_FACING 53
#define MA_PUNCHING 54
#define MAX_DANGEROUSPROPS 12
#define MAX_MPCHRS (4 + MAX_SIMULANTS)
#define MAX_OBJECTIVES 10
#define MAX_SIMULANTS 8
#define MAX_SQUADRONS 16
#define MAX_TEAMS 8
#define MENUOP_GETOPTIONCOUNT 1
#define MENUOP_GETOPTIONTEXT 3
#define MENUOP_SET 6
@@ -546,6 +552,16 @@
#define MPSCENARIO_KINGOFTHEHILL 4
#define MPSCENARIO_CAPTURETHECASE 5
#define NUM_AICOMMANDS 481
#define NUM_CHALLENGES 30
#define NUM_CHEATS 42
#define NUM_FIRESLOTS 20
#define NUM_MPBOTCOMMANDS 14
#define NUM_MPTRACKS 42
#define NUM_SOLOSTAGES 21
#define NUM_STAGES 90
#define NUM_WEAPONS 94
// obj->flags
#define OBJECTFLAG0_00000001 0x00000001 // Not used in scripts
#define OBJECTFLAG0_00000002 0x00000002 // Not used in scripts
@@ -907,8 +923,6 @@
#define STAGE_DUEL 0x4f
#define STAGE_TEST_LAM 0x50
#define NUM_STAGES 0x5a
#define STAGEINDEX_MAIANSOS 0x00
#define STAGEINDEX_TEST_SILO 0x01
#define STAGEINDEX_WAR 0x02
@@ -1067,8 +1081,6 @@
#define WEAPON_5C 0x5c
#define WEAPON_SUICIDEPILL 0x5d
#define MAX_WEAPON_ID 0x5d
// Heads and bodies
#define HEAD_RANDOM -1
#define BODY_DJBOND 0x00
@@ -1887,4 +1899,3 @@
//.set ANIM_, 0x0350: Skedar right up straight up
//.set ANIM_, 0x0351: Skedar stretching arms and lefts
#define ANIM_SKEDAR_COLLAPSE 0x0352
src/include/gvars/gvars.h
+7 -7
View File
@@ -533,7 +533,7 @@ extern u32 var8009cadc;
extern u32 var8009cae0;
extern u32 var8009cb08;
extern u32 var8009cbf8;
extern struct prop *g_DangerousProps[12];
extern struct prop *g_DangerousProps[MAX_DANGEROUSPROPS];
extern u32 var8009cc30;
extern u32 var8009cc40;
extern u32 var8009cc44;
@@ -580,7 +580,7 @@ extern u32 var8009cf10;
extern u32 var8009cf88;
extern struct stagesetup g_StageSetup;
extern u32 var8009d050;
extern struct objective *g_Objectives[10];
extern struct objective *g_Objectives[MAX_OBJECTIVES];
extern u32 var8009d088;
extern u32 var8009d0b0;
extern u32 var8009d0b4;
@@ -592,7 +592,7 @@ extern u32 var8009d0d8;
extern u32 var8009d0e0;
extern u32 var8009d0f0;
extern u32 var8009d144;
extern struct fireslot g_Fireslots[];
extern struct fireslot g_Fireslots[NUM_FIRESLOTS];
extern u32 var8009d510;
extern u32 var8009da60;
extern u32 var8009dbe0;
@@ -840,12 +840,12 @@ extern u32 var800ac390;
extern u32 var800ac3f8;
extern u32 var800ac460;
extern u32 var800ac4cc;
extern struct chrdata *g_MpPlayerChrs[12];
extern struct mpchr *var800ac500[12];
extern struct chrdata *g_MpPlayerChrs[MAX_MPCHRS];
extern struct mpchr *var800ac500[MAX_MPCHRS];
extern s32 g_MpNumPlayers;
extern struct mpsim g_MpSimulants[8];
extern struct mpsim g_MpSimulants[MAX_SIMULANTS];
extern u32 var800ac798[8];
extern struct mpplayer g_MpPlayers[];
extern struct mpplayer g_MpPlayers[4];
extern u32 var800aca38;
extern u32 var800acad8;
extern u32 var800acb78;
src/include/setup/setup_000000.h
+3 -3
View File
@@ -30,8 +30,8 @@ extern u32 g_StageFlags;
extern struct audiodefinition audiodefinitions[];
extern struct audioconfig audioconfigs[];
extern bool (*g_CommandPointers[])(void);
extern u16 g_CommandLengths[];
extern bool (*g_CommandPointers[NUM_AICOMMANDS])(void);
extern u16 g_CommandLengths[NUM_AICOMMANDS];
extern struct coord var80068fec;
@@ -416,7 +416,7 @@ extern u32 var8006843c;
extern u32 var80068440;
extern u32 var8006844c;
extern u32 var8006845c;
extern u8 g_ChrTeamIds[8];
extern u8 g_ChrTeamIds[MAX_TEAMS];
extern u32 var8006846c;
extern u32 var80068fe0;
extern u16 quiptable_human_bank0[];
src/include/setup/setup_0160b0.h
+2 -2
View File
@@ -187,7 +187,7 @@ extern struct menu_dialog g_CoopOptionsMenuDialog;
extern struct menu_dialog g_AntiOptionsMenuDialog;
extern struct menu_dialog menudialog_selectdifficulty2;
extern struct menu_dialog menudialog_selectdifficulty3;
extern struct stageoverviewentry g_StageNames[];
extern struct stageoverviewentry g_StageNames[NUM_SOLOSTAGES];
extern struct mission missions[];
extern struct menu_dialog g_ControlStyleMultiMenuDialog;
extern struct menu_dialog g_ControlStyleSingleMenuDialog;
@@ -207,7 +207,7 @@ extern u16 mainmenulabels_nocheats[];
extern u16 mainmenulabels_withcheats[];
extern struct menu_dialog menudialog_mainmenu;
extern struct menu_dialog menudialog_mainmenu2;
extern struct cheat g_Cheats[];
extern struct cheat g_Cheats[NUM_CHEATS];
extern struct menu_item menuitems_cheats_buddies[];
extern struct menu_dialog menudialog_cheats_buddies;
extern u16 iomessages[];
src/include/setup/setup_020df0.h
+4 -4
View File
@@ -303,12 +303,12 @@ extern u32 table_0x2d678[];
extern struct mpsimulant g_MpGeneralSimulants[];
extern struct mpsimulant mpspecialsimulants[];
extern struct bodynum mpbodytable[];
extern struct mptrack g_MpTracks[42];
extern struct mptrack g_MpTracks[NUM_MPTRACKS];
extern u32 mppresets[];
extern u32 g_TeamColours[];
extern u32 g_TeamColours[MAX_TEAMS];
extern u32 var80087d10;
extern u32 var80087d14[];
extern u32 g_MpBotCommands[];
extern u32 g_MpBotCommands[NUM_MPBOTCOMMANDS];
extern u32 var80087e2c;
extern u32 var80087e50;
extern u32 var80087e98;
@@ -318,7 +318,7 @@ extern u32 var80088494;
extern u32 var800884a4;
extern u32 g_MpChallengeIndex;
extern u32 var800884b4;
extern struct challenge g_MpChallenges[];
extern struct challenge g_MpChallenges[NUM_CHALLENGES];
extern u32 var800887c4;
extern u32 var80088800;
extern u32 var80088808;
src/include/types.h
+1 -1
View File
@@ -4127,7 +4127,7 @@ struct savefile_solo {
/*0x14*/ u32 flags;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u16 besttimes[21][3];
/*0x20*/ u16 besttimes[NUM_SOLOSTAGES][3];
/*0xa0*/ u32 var800a22a0;
/*0xa4*/ u32 var800a22a4;
/*0xa8*/ u32 var800a22a8;