mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-06-25 00:53:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace literals with head/body constants and move some other defines into constants.h

Browse Source
This commit is contained in:
Ryan Dwyer
2020-01-19 21:52:37 +10:00
parent fde1b97431
commit e6e0218fe8
8 changed files with 188 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/constants.h
+45 -1
View File
@@ -411,6 +411,13 @@
#define IDLEACTION_OPERATING 0x04
#define IDLEACTION_OPERATING_PAD 0x05
#define INVENTORYFUNCTYPE_NONE 0
#define INVENTORYFUNCTYPE_SHOOT 1
#define INVENTORYFUNCTYPE_THROW 2
#define INVENTORYFUNCTYPE_CLOSE 3
#define INVENTORYFUNCTYPE_SPECIAL 4
#define INVENTORYFUNCTYPE_VISUAL 5
// These actions are assigned to chr->myaction
#define MA_NONE 0
#define MA_NORMAL 1
@@ -475,6 +482,28 @@
#define MAX_SQUADRONS 16
#define MAX_TEAMS 8
#define MENUDIALOGTYPE_DEFAULT 1
#define MENUDIALOGTYPE_DANGER 2
#define MENUDIALOGTYPE_SUCCESS 3
#define MENUITEMTYPE_LABEL 0x01
#define MENUITEMTYPE_CUSTOM 0x02
#define MENUITEMTYPE_SELECTABLE 0x04
#define MENUITEMTYPE_SCROLLABLE 0x05
#define MENUITEMTYPE_OBJECTIVES 0x06
#define MENUITEMTYPE_SLIDER 0x08
#define MENUITEMTYPE_CHECKBOX 0x09
#define MENUITEMTYPE_SEPARATOR 0x0b
#define MENUITEMTYPE_DROPDOWN 0x0c
#define MENUITEMTYPE_KEYBOARD 0x0d
#define MENUITEMTYPE_RANKING 0x0e
#define MENUITEMTYPE_PLAYERSTATS 0x0f
#define MENUITEMTYPE_CAROUSEL 0x11
#define MENUITEMTYPE_MODEL 0x12
#define MENUITEMTYPE_MARQUEE 0x17
#define MENUITEMTYPE_CONTROLLER 0x19
#define MENUITEMTYPE_END 0x1a
#define MENUOP_GETOPTIONCOUNT 1
#define MENUOP_GETOPTIONTEXT 3
#define MENUOP_SET 6
@@ -559,6 +588,7 @@
#define NUM_MPBEAUHEADS 5
#define NUM_MPBOTCOMMANDS 14
#define NUM_MPBODIES 61
#define NUM_MPHEADS 75
#define NUM_MPTRACKS 42
#define NUM_SOLONORMALSTAGES 17
#define NUM_SOLOSTAGES 21
@@ -1231,7 +1261,7 @@
#define BODY_CILABTECH 0x8e
#define BODY_CIFEMTECH 0x8f
#define BODY_CARREVENINGSUIT 0x90
#define BODY_JONATHON 0x91
#define BODY_JONATHAN 0x91
#define BODY_CISOLDIER 0x92
#define BODY_SKEDARKING 0x93
#define BODY_ELVISWAISTCOAT 0x94
@@ -1801,6 +1831,20 @@
#define MUSIC_BETA_MELODY 0x75
#define MUSIC_ESCAPE_OUTRO_SHORT 0x76
#define SIMTYPE_GENERAL 0
#define SIMTYPE_PEACE 1
#define SIMTYPE_SHIELD 2
#define SIMTYPE_ROCKET 3
#define SIMTYPE_KAZE 4
#define SIMTYPE_FIST 5
#define SIMTYPE_PREY 6
#define SIMTYPE_COWARD 7
#define SIMTYPE_JUDGE 8
#define SIMTYPE_FEUD 9
#define SIMTYPE_SPEED 10
#define SIMTYPE_TURTLE 11
#define SIMTYPE_VENGE 12
#define SQUADRON_00 0x00
#define SQUADRON_01 0x01
#define SQUADRON_02 0x02
src/include/setup/setup_020df0.h
+1 -1
View File
@@ -299,7 +299,7 @@ extern u32 var800874c8;
extern u32 var800874cc;
extern u32 var800874f0;
extern struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS];
extern struct mphead g_MpHeads[];
extern struct mphead g_MpHeads[NUM_MPHEADS];
extern u32 table_0x2d678[];
extern struct mpsimulant g_MpGeneralSimulants[];
extern struct mpsimulant mpspecialsimulants[];
src/include/types.h
-43
View File
@@ -2731,13 +2731,6 @@ struct inventory_typef {
u32 unk10;
};
#define INVENTORYFUNCTYPE_NONE 0
#define INVENTORYFUNCTYPE_SHOOT 1
#define INVENTORYFUNCTYPE_THROW 2
#define INVENTORYFUNCTYPE_CLOSE 3
#define INVENTORYFUNCTYPE_SPECIAL 4
#define INVENTORYFUNCTYPE_VISUAL 5
struct inventory_function {
u16 unk00;
u8 unk02;
@@ -2851,20 +2844,6 @@ struct mphead {
u8 unlockvalue;
};
#define SIMTYPE_GENERAL 0
#define SIMTYPE_PEACE 1
#define SIMTYPE_SHIELD 2
#define SIMTYPE_ROCKET 3
#define SIMTYPE_KAZE 4
#define SIMTYPE_FIST 5
#define SIMTYPE_PREY 6
#define SIMTYPE_COWARD 7
#define SIMTYPE_JUDGE 8
#define SIMTYPE_FEUD 9
#define SIMTYPE_SPEED 10
#define SIMTYPE_TURTLE 11
#define SIMTYPE_VENGE 12
struct mpsimulant {
u8 type;
u8 skill;
@@ -2984,24 +2963,6 @@ struct hoverprop {
u16 size;
};
#define MENUITEMTYPE_LABEL 0x01
#define MENUITEMTYPE_CUSTOM 0x02
#define MENUITEMTYPE_SELECTABLE 0x04
#define MENUITEMTYPE_SCROLLABLE 0x05
#define MENUITEMTYPE_OBJECTIVES 0x06
#define MENUITEMTYPE_SLIDER 0x08
#define MENUITEMTYPE_CHECKBOX 0x09
#define MENUITEMTYPE_SEPARATOR 0x0b
#define MENUITEMTYPE_DROPDOWN 0x0c
#define MENUITEMTYPE_KEYBOARD 0x0d
#define MENUITEMTYPE_RANKING 0x0e
#define MENUITEMTYPE_PLAYERSTATS 0x0f
#define MENUITEMTYPE_CAROUSEL 0x11
#define MENUITEMTYPE_MODEL 0x12
#define MENUITEMTYPE_MARQUEE 0x17
#define MENUITEMTYPE_CONTROLLER 0x19
#define MENUITEMTYPE_END 0x1a
struct menu_item {
u8 type;
u8 param;
@@ -3011,10 +2972,6 @@ struct menu_item {
void *handler;
};
#define MENUDIALOGTYPE_DEFAULT 0x01
#define MENUDIALOGTYPE_DANGER 0x02
#define MENUDIALOGTYPE_SUCCESS 0x03
struct menu_dialog {
u8 type;
u32 title;