falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/files/setup/setupark.c
View File

@ -364,7 +364,7 @@ u8 props[] = {
tag(0x17, 1)
stdobject(0x0100, MODEL_CHRNIGHTSIGHT, 0xffff, 0x012405e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)
rename_object(-1, 0x2d, 0x061b, 0x061c, 0x061d, 0x061e, 0x061f, 0x0000, 0x0000) // "Obtain Night Vision."
chr(0x00000400, 0x00, 0x0210, BODY_DRCARROLL, HEAD_RANDOM, AILIST_INIT_DRCAROLL, -1, -1, 1000, 100, 0x00000000, 0x00000000, TEAM_ALLY, SQUADRON_00, -1, 0, 0x00000000)
chr(0x00000400, 0x00, 0x0210, BODY_DRCAROLL, HEAD_RANDOM, AILIST_INIT_DRCAROLL, -1, -1, 1000, 100, 0x00000000, 0x00000000, TEAM_ALLY, SQUADRON_00, -1, 0, 0x00000000)
chr(0x00000200, 0x01, 0x0215, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_SHOCK, -1, -1, 1000, 7, 0x00014400, 0x00000000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0x00000000)
weapon(0x0100, MODEL_CHRCMP150, 0x0001, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_CMP150, 0x00ffffff, 0x00000000)
chr(0x00000200, 0x02, 0x021b, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_SHOCK, -1, -1, 1000, 7, 0x00014400, 0x00000000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0x00000000)

2
src/files/setup/setupear.c
View File

@ -396,7 +396,7 @@ u8 props[] = {
chr(0x00010400, 0x36, 0x0139, BODY_DD_LABTECH, HEAD_JON, AILIST_INIT_SCIENTIST, -1, -1, 1000, 10, 0x00004000, 0x00000000, TEAM_ENEMY, SQUADRON_08, -1, 0, 0x01000000)
chr(0x00010400, 0x37, 0x013a, BODY_DD_LABTECH, HEAD_DUNCAN2, AILIST_INIT_SCIENTIST, -1, -1, 1000, 10, 0x00000000, 0x00000000, TEAM_ENEMY, SQUADRON_08, -1, 0, 0x02000000)
chr(0x00000400, 0x3a, 0x0106, BODY_DDSHOCK, HEAD_DARLING, GAILIST_IDLE, -1, -1, 1000, 100, 0x0000c200, 0x00000000, TEAM_ENEMY, SQUADRON_08, -1, 0, 0x00000000)
chr(0x00010400, 0x39, 0x010c, BODY_DRCARROLL, 0x00, GAILIST_IDLE, -1, -1, 1000, 100, 0x0000c200, 0x00000000, TEAM_ENEMY, SQUADRON_08, -1, 0, 0x00000000)
chr(0x00010400, 0x39, 0x010c, BODY_DRCAROLL, 0x00, GAILIST_IDLE, -1, -1, 1000, 100, 0x0000c200, 0x00000000, TEAM_ENEMY, SQUADRON_08, -1, 0, 0x00000000)
tag(0x0b, 1)
singlemonitor(0x0100, MODEL_SINISTERPC, 0x0246, 0x000004e1, 0x00000001, 0x00210000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff03)
tag(0x0c, 1)

2
src/files/setup/setuppam.c
View File

@ -218,7 +218,7 @@ u8 props[] = {
weapon(0x0100, MODEL_CHRCMP150, 0x0020, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_CMP150, 0x00ffffff, 0x00000000)
chr(0x00000100, 0x22, 0x0192, BODY_MRBLONDE, HEAD_MRBLONDE, AILIST_BLONDE, -1, -1, 100, 100, 0xc8082000, 0x00000000, TEAM_ALLY, SQUADRON_0F, -1, 0, 0x00000000)
weapon(0x0100, MODEL_CHRAVENGER, 0x0022, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_K7AVENGER, 0x00ffffff, 0x00000000)
chr(0x00010500, 0x24, 0x0193, BODY_DRCARROLL, 0x00, GAILIST_IDLE, -1, -1, 100, 100, 0xc8080000, 0x00000000, TEAM_ALLY, SQUADRON_05, -1, 0, 0x00000000)
chr(0x00010500, 0x24, 0x0193, BODY_DRCAROLL, 0x00, GAILIST_IDLE, -1, -1, 100, 100, 0xc8080000, 0x00000000, TEAM_ALLY, SQUADRON_05, -1, 0, 0x00000000)
weapon(0x0100, MODEL_CHRAVENGER, 0x0024, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_K7AVENGER, 0x00ffffff, 0x00000000)
chr(0x00000100, 0x23, 0x0194, BODY_MRBLONDE, HEAD_MRBLONDE, AILIST_BLONDE, -1, -1, 100, 100, 0xc8082000, 0x00000000, TEAM_ALLY, SQUADRON_0F, -1, 0, 0x00000000)
weapon(0x0100, MODEL_CHRAVENGER, 0x0023, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_K7AVENGER, 0x00ffffff, 0x00000000)

4
src/game/game_187770.c
View File

@ -5093,12 +5093,12 @@ glabel func0f18b9e4
u32 func0f18bb1c(void)
{
return 75;
return NUM_MPHEADS;
}
s32 mpGetNumHeads(void)
{
return 75;
return NUM_MPHEADS;
}
s32 mpGetHeadId(u8 headnum)

46
src/include/constants.h
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

2
src/include/setup/setup_020df0.h
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[];

43
src/include/types.h
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;

274
src/setup/setup_020df0.c
View File

@ -11937,83 +11937,83 @@ struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS] = {
{ HEAD_BEAU6, 0x00 },
};
struct mphead g_MpHeads[] = {
struct mphead g_MpHeads[NUM_MPHEADS] = {
// head, unlock value
{ /*0x00*/ 0x04, 0x00 },
{ /*0x01*/ 0x0c, 0x41 },
{ /*0x02*/ 0x2f, 0x45 },
{ /*0x03*/ 0x3c, 0x4a },
{ /*0x04*/ 0x05, 0x3d },
{ /*0x05*/ 0x3a, 0x3d },
{ /*0x06*/ 0x07, 0x00 },
{ /*0x07*/ 0x08, 0x38 },
{ /*0x08*/ 0x0e, 0x00 },
{ /*0x09*/ 0x09, 0x35 },
{ /*0x0a*/ 0x28, 0x3a },
{ /*0x0b*/ 0x3e, 0x00 },
{ /*0x0c*/ 0x3d, 0x41 },
{ /*0x0d*/ 0x0a, 0x00 },
{ /*0x0e*/ 0x1d, 0x3c },
{ /*0x0f*/ 0x30, 0x34 },
{ /*0x10*/ 0x39, 0x3a },
{ /*0x11*/ 0x0d, 0x00 },
{ /*0x12*/ 0x10, 0x32 },
{ /*0x13*/ 0x19, 0x32 },
{ /*0x14*/ 0x29, 0x3d },
{ /*0x15*/ 0x11, 0x00 },
{ /*0x16*/ 0x18, 0x00 },
{ /*0x17*/ 0x06, 0x00 },
{ /*0x18*/ 0x12, 0x00 },
{ /*0x19*/ 0x13, 0x00 },
{ /*0x1a*/ 0x14, 0x00 },
{ /*0x1b*/ 0x16, 0x00 },
{ /*0x1c*/ 0x1a, 0x00 },
{ /*0x1d*/ 0x1b, 0x00 },
{ /*0x1e*/ 0x1c, 0x00 },
{ /*0x1f*/ 0x37, 0x00 },
{ /*0x20*/ 0x3b, 0x00 },
{ /*0x21*/ 0x42, 0x00 },
{ /*0x22*/ 0x43, 0x00 },
{ /*0x23*/ 0x48, 0x00 },
{ /*0x24*/ 0x54, 0x00 },
{ /*0x25*/ 0x0b, 0x00 },
{ /*0x26*/ 0x17, 0x00 },
{ /*0x27*/ 0x1e, 0x00 },
{ /*0x28*/ 0x2a, 0x00 },
{ /*0x29*/ 0x44, 0x00 },
{ /*0x2a*/ 0x49, 0x00 },
{ /*0x2b*/ 0x4a, 0x00 },
{ /*0x2c*/ 0x4b, 0x00 },
{ /*0x2d*/ 0x4c, 0x00 },
{ /*0x2e*/ 0x4d, 0x00 },
{ /*0x2f*/ 0x4e, 0x00 },
{ /*0x30*/ 0x4f, 0x00 },
{ /*0x31*/ 0x50, 0x00 },
{ /*0x32*/ 0x51, 0x00 },
{ /*0x33*/ 0x52, 0x00 },
{ /*0x34*/ 0x53, 0x00 },
{ /*0x35*/ 0x55, 0x00 },
{ /*0x36*/ 0x45, 0x00 },
{ /*0x37*/ 0x46, 0x00 },
{ /*0x38*/ 0x47, 0x00 },
{ /*0x39*/ 0x1f, 0x00 },
{ /*0x3a*/ 0x20, 0x00 },
{ /*0x3b*/ 0x21, 0x00 },
{ /*0x3c*/ 0x22, 0x00 },
{ /*0x3d*/ 0x23, 0x00 },
{ /*0x3e*/ 0x24, 0x00 },
{ /*0x3f*/ 0x25, 0x00 },
{ /*0x40*/ 0x26, 0x00 },
{ /*0x41*/ 0x27, 0x00 },
{ /*0x42*/ 0x2e, 0x00 },
{ /*0x43*/ 0x41, 0x00 },
{ /*0x44*/ 0x3f, 0x00 },
{ /*0x45*/ 0x2c, 0x00 },
{ /*0x46*/ 0x2d, 0x00 },
{ /*0x47*/ 0x40, 0x00 },
{ /*0x48*/ 0x35, 0x00 },
{ /*0x49*/ 0x36, 0x00 },
{ /*0x4a*/ 0x38, 0x00 },
{ /*0x00*/ HEAD_DARK_COMBAT, 0x00 },
{ /*0x01*/ HEAD_DARK_FROCK, 0x41 },
{ /*0x02*/ HEAD_DARKAQUA, 0x45 },
{ /*0x03*/ HEAD_DARK_SNOW, 0x4a },
{ /*0x04*/ HEAD_ELVIS, 0x3d },
{ /*0x05*/ HEAD_ELVIS_GOGS, 0x3d },
{ /*0x06*/ HEAD_CARRINGTON, 0x00 },
{ /*0x07*/ HEAD_MRBLONDE, 0x38 },
{ /*0x08*/ HEAD_CASSANDRA, 0x00 },
{ /*0x09*/ HEAD_TRENT, 0x35 },
{ /*0x0a*/ HEAD_JONATHAN, 0x3a },
{ /*0x0b*/ HEAD_VD, 0x00 },
{ /*0x0c*/ HEAD_PRESIDENT, 0x41 },
{ /*0x0d*/ HEAD_DDSHOCK, 0x00 },
{ /*0x0e*/ HEAD_BIOTECH, 0x3c },
{ /*0x0f*/ HEAD_DDSNIPER, 0x34 },
{ /*0x10*/ HEAD_A51FACEPLATE, 0x3a },
{ /*0x11*/ HEAD_SECRETARY, 0x00 },
{ /*0x12*/ HEAD_FEM_GUARD, 0x32 },
{ /*0x13*/ HEAD_FEM_GUARD2, 0x32 },
{ /*0x14*/ HEAD_MAIAN_S, 0x3d },
{ /*0x15*/ HEAD_JON, 0x00 },
{ /*0x16*/ HEAD_BEAU1, 0x00 },
{ /*0x17*/ HEAD_ROSS, 0x00 },
{ /*0x18*/ HEAD_MARK2, 0x00 },
{ /*0x19*/ HEAD_CHRIST, 0x00 },
{ /*0x1a*/ HEAD_RUSS, 0x00 },
{ /*0x1b*/ HEAD_DARLING, 0x00 },
{ /*0x1c*/ HEAD_BRIAN, 0x00 },
{ /*0x1d*/ HEAD_JAMIE, 0x00 },
{ /*0x1e*/ HEAD_DUNCAN2, 0x00 },
{ /*0x1f*/ HEAD_KEITH, 0x00 },
{ /*0x20*/ HEAD_STEVEM, 0x00 },
{ /*0x21*/ HEAD_GRANT, 0x00 },
{ /*0x22*/ HEAD_PENNY, 0x00 },
{ /*0x23*/ HEAD_DAVEC, 0x00 },
{ /*0x24*/ HEAD_JONES, 0x00 },
{ /*0x25*/ HEAD_GRAHAM, 0x00 },
{ /*0x26*/ HEAD_ROBERT, 0x00 },
{ /*0x27*/ HEAD_NEIL2, 0x00 },
{ /*0x28*/ HEAD_SHAUN, 0x00 },
{ /*0x29*/ HEAD_ROBIN, 0x00 },
{ /*0x2a*/ HEAD_COOK, 0x00 },
{ /*0x2b*/ HEAD_PRYCE, 0x00 },
{ /*0x2c*/ HEAD_SILKE, 0x00 },
{ /*0x2d*/ HEAD_SMITH, 0x00 },
{ /*0x2e*/ HEAD_GARETH, 0x00 },
{ /*0x2f*/ HEAD_MURCHIE, 0x00 },
{ /*0x30*/ HEAD_WONG, 0x00 },
{ /*0x31*/ HEAD_CARTER, 0x00 },
{ /*0x32*/ HEAD_TINTIN, 0x00 },
{ /*0x33*/ HEAD_MUNTON, 0x00 },
{ /*0x34*/ HEAD_STAMPER, 0x00 },
{ /*0x35*/ HEAD_PHELPS, 0x00 },
{ /*0x36*/ HEAD_ALEX, 0x00 },
{ /*0x37*/ HEAD_JULIANNE, 0x00 },
{ /*0x38*/ HEAD_LAURA, 0x00 },
{ /*0x39*/ HEAD_EDMCG, 0x00 },
{ /*0x3a*/ HEAD_ANKA, 0x00 },
{ /*0x3b*/ HEAD_LESLIE_S, 0x00 },
{ /*0x3c*/ HEAD_MATT_C, 0x00 },
{ /*0x3d*/ HEAD_PEER_S, 0x00 },
{ /*0x3e*/ HEAD_EILEEN_T, 0x00 },
{ /*0x3f*/ HEAD_ANDY_R, 0x00 },
{ /*0x40*/ HEAD_BEN_R, 0x00 },
{ /*0x41*/ HEAD_STEVE_K, 0x00 },
{ /*0x42*/ HEAD_SANCHEZ, 0x00 },
{ /*0x43*/ HEAD_TIM, 0x00 },
{ /*0x44*/ HEAD_KEN, 0x00 },
{ /*0x45*/ HEAD_EILEEN_H, 0x00 },
{ /*0x46*/ HEAD_SCOTT_H, 0x00 },
{ /*0x47*/ HEAD_JOEL, 0x00 },
{ /*0x48*/ HEAD_GRIFFEY, 0x00 },
{ /*0x49*/ HEAD_MOTO, 0x00 },
{ /*0x4a*/ HEAD_WINNER, 0x00 },
};
// 2d678
@ -12056,67 +12056,67 @@ struct mpsimulant mpspecialsimulants[] = {
// 2d7dc
struct mpbody g_MpBodies[NUM_MPBODIES] = {
// global body ID, name, unk04, unk06
/*0x00*/ { 0x0056, 0x5610, 0x0004, 0x00 },
/*0x01*/ { 0x0062, 0x5611, 0x0004, 0x46 },
/*0x02*/ { 0x0061, 0x5612, 0x000c, 0x41 },
/*0x03*/ { 0x006d, 0x5613, 0x000c, 0x41 },
/*0x04*/ { 0x0086, 0x5614, 0x0004, 0x3f },
/*0x05*/ { 0x0095, 0x549c, 0x0004, 0x37 },
/*0x06*/ { 0x0096, 0x549d, 0x0004, 0x34 },
/*0x07*/ { 0x0087, 0x5615, 0x002f, 0x45 },
/*0x08*/ { 0x0088, 0x5616, 0x002f, 0x45 },
/*0x09*/ { 0x0089, 0x5617, 0x003c, 0x4a },
/*0x0a*/ { 0x008a, 0x5618, 0x0004, 0x3a },
/*0x0b*/ { 0x0067, 0x5619, 0x0005, 0x3d },
/*0x0c*/ { 0x0057, 0x561a, 0x0005, 0x3d },
/*0x0d*/ { 0x0094, 0x549e, 0x0005, 0x3d },
/*0x0e*/ { 0x005a, 0x561b, 0x0007, 0x00 },
/*0x0f*/ { 0x0090, 0x561c, 0x0007, 0x41 },
/*0x10*/ { 0x005b, 0x561d, 0x0008, 0x38 },
/*0x11*/ { 0x0066, 0x561e, 0x000e, 0x00 },
/*0x12*/ { 0x005d, 0x561f, 0x0009, 0x35 },
/*0x13*/ { 0x0091, 0x5620, 0x0028, 0x4c },
/*0x14*/ { 0x008e, 0x5621, 0x03e8, 0x00 },
/*0x15*/ { 0x008f, 0x5622, 0x03e8, 0x00 },
/*0x16*/ { 0x0092, 0x5623, 0x03e8, 0x00 },
/*0x17*/ { 0x005e, 0x5624, 0x000a, 0x00 },
/*0x18*/ { 0x0068, 0x5625, 0x03e8, 0x32 },
/*0x19*/ { 0x006a, 0x5626, 0x03e8, 0x00 },
/*0x1a*/ { 0x006e, 0x5627, 0x03e8, 0x00 },
/*0x1b*/ { 0x006f, 0x5628, 0x03e8, 0x00 },
/*0x1c*/ { 0x0065, 0x5629, 0x03e8, 0x00 },
/*0x1d*/ { 0x0063, 0x562a, 0x03e8, 0x33 },
/*0x1e*/ { 0x0064, 0x562b, 0x03e8, 0x33 },
/*0x1f*/ { 0x007e, 0x562c, 0x03e8, 0x34 },
/*0x20*/ { 0x008c, 0x562d, 0x0030, 0x34 },
/*0x21*/ { 0x007f, 0x562e, 0x03e8, 0x37 },
/*0x22*/ { 0x0081, 0x562f, 0x03e8, 0x37 },
/*0x23*/ { 0x0073, 0x5630, 0x03e8, 0x39 },
/*0x24*/ { 0x0072, 0x5631, 0x03e8, 0x39 },
/*0x25*/ { 0x0058, 0x5632, 0x03e8, 0x3a },
/*0x26*/ { 0x0074, 0x5633, 0x03e8, 0x3a },
/*0x27*/ { 0x0075, 0x5634, 0x03e8, 0x3a },
/*0x28*/ { 0x0059, 0x5635, 0x03e8, 0x3a },
/*0x29*/ { 0x0060, 0x5636, 0x03e8, 0x44 },
/*0x2a*/ { 0x005f, 0x5637, 0x03e8, 0x3b },
/*0x2b*/ { 0x008b, 0x5638, 0x03e8, 0x3b },
/*0x2c*/ { 0x0069, 0x5639, 0x03e8, 0x3b },
/*0x2d*/ { 0x0071, 0x563a, 0x001d, 0x3c },
/*0x2e*/ { 0x0082, 0x563b, 0x03e8, 0x3e },
/*0x2f*/ { 0x008d, 0x563c, 0x03e8, 0x3f },
/*0x30*/ { 0x0077, 0x563d, 0x03e8, 0x3f },
/*0x31*/ { 0x0078, 0x563e, 0x03e8, 0x3f },
/*0x32*/ { 0x007a, 0x563f, 0x03e8, 0x3f },
/*0x33*/ { 0x0079, 0x5640, 0x003d, 0x41 },
/*0x34*/ { 0x007c, 0x5641, 0x03e8, 0x36 },
/*0x35*/ { 0x007d, 0x5642, 0x03e8, 0x43 },
/*0x36*/ { 0x0085, 0x5643, 0x003d, 0x42 },
/*0x37*/ { 0x0080, 0x5644, 0x03e8, 0x45 },
/*0x38*/ { 0x0083, 0x5645, 0x0029, 0x3d },
/*0x39*/ { 0x0001, 0x5646, 0x03e8, 0x40 },
/*0x3a*/ { 0x0003, 0x5646, 0x03e8, 0x40 },
/*0x3b*/ { 0x0002, 0x5646, 0x03e8, 0x40 },
/*0x3c*/ { 0x0000, 0x5646, 0x03e8, 0x40 },
/*0x00*/ { BODY_DARK_COMBAT, 0x5610, 0x0004, 0x00 },
/*0x01*/ { BODY_DARK_TRENCH, 0x5611, 0x0004, 0x46 },
/*0x02*/ { BODY_DARK_FROCK, 0x5612, 0x000c, 0x41 },
/*0x03*/ { BODY_DARK_RIPPED, 0x5613, 0x000c, 0x41 },
/*0x04*/ { BODY_DARK_AF1, 0x5614, 0x0004, 0x3f },
/*0x05*/ { BODY_DARK_LEATHER, 0x549c, 0x0004, 0x37 },
/*0x06*/ { BODY_DARK_NEGOTIATOR, 0x549d, 0x0004, 0x34 },
/*0x07*/ { BODY_DARKWET, 0x5615, 0x002f, 0x45 },
/*0x08*/ { BODY_DARKAQUALUNG, 0x5616, 0x002f, 0x45 },
/*0x09*/ { BODY_DARKSNOW, 0x5617, 0x003c, 0x4a },
/*0x0a*/ { BODY_DARKLAB, 0x5618, 0x0004, 0x3a },
/*0x0b*/ { BODY_THEKING, 0x5619, 0x0005, 0x3d },
/*0x0c*/ { BODY_ELVIS1, 0x561a, 0x0005, 0x3d },
/*0x0d*/ { BODY_ELVISWAISTCOAT, 0x549e, 0x0005, 0x3d },
/*0x0e*/ { BODY_CARRINGTON, 0x561b, 0x0007, 0x00 },
/*0x0f*/ { BODY_CARREVENINGSUIT, 0x561c, 0x0007, 0x41 },
/*0x10*/ { BODY_MRBLONDE, 0x561d, 0x0008, 0x38 },
/*0x11*/ { BODY_CASSANDRA, 0x561e, 0x000e, 0x00 },
/*0x12*/ { BODY_TRENT, 0x561f, 0x0009, 0x35 },
/*0x13*/ { BODY_JONATHAN, 0x5620, 0x0028, 0x4c },
/*0x14*/ { BODY_CILABTECH, 0x5621, 0x03e8, 0x00 },
/*0x15*/ { BODY_CIFEMTECH, 0x5622, 0x03e8, 0x00 },
/*0x16*/ { BODY_CISOLDIER, 0x5623, 0x03e8, 0x00 },
/*0x17*/ { BODY_DDSHOCK, 0x5624, 0x000a, 0x00 },
/*0x18*/ { BODY_FEM_GUARD, 0x5625, 0x03e8, 0x32 },
/*0x19*/ { BODY_DD_SECGUARD, 0x5626, 0x03e8, 0x00 },
/*0x1a*/ { BODY_DD_GUARD, 0x5627, 0x03e8, 0x00 },
/*0x1b*/ { BODY_DD_SHOCK_INF, 0x5628, 0x03e8, 0x00 },
/*0x1c*/ { BODY_SECRETARY, 0x5629, 0x03e8, 0x00 },
/*0x1d*/ { BODY_OFFICEWORKER, 0x562a, 0x03e8, 0x33 },
/*0x1e*/ { BODY_OFFICEWORKER2, 0x562b, 0x03e8, 0x33 },
/*0x1f*/ { BODY_NEGOTIATOR, 0x562c, 0x03e8, 0x34 },
/*0x20*/ { BODY_DDSNIPER, 0x562d, 0x0030, 0x34 },
/*0x21*/ { BODY_G5_GUARD, 0x562e, 0x03e8, 0x37 },
/*0x22*/ { BODY_G5_SWAT_GUARD, 0x562f, 0x03e8, 0x37 },
/*0x23*/ { BODY_CIAGUY, 0x5630, 0x03e8, 0x39 },
/*0x24*/ { BODY_FBIGUY, 0x5631, 0x03e8, 0x39 },
/*0x25*/ { BODY_AREA51GUARD, 0x5632, 0x03e8, 0x3a },
/*0x26*/ { BODY_A51TROOPER, 0x5633, 0x03e8, 0x3a },
/*0x27*/ { BODY_A51AIRMAN, 0x5634, 0x03e8, 0x3a },
/*0x28*/ { BODY_OVERALL, 0x5635, 0x03e8, 0x3a },
/*0x29*/ { BODY_STRIPES, 0x5636, 0x03e8, 0x44 },
/*0x2a*/ { BODY_LABTECH, 0x5637, 0x03e8, 0x3b },
/*0x2b*/ { BODY_FEMLABTECH, 0x5638, 0x03e8, 0x3b },
/*0x2c*/ { BODY_DD_LABTECH, 0x5639, 0x03e8, 0x3b },
/*0x2d*/ { BODY_BIOTECH, 0x563a, 0x001d, 0x3c },
/*0x2e*/ { BODY_ALASKAN_GUARD, 0x563b, 0x03e8, 0x3e },
/*0x2f*/ { BODY_PILOTAF1, 0x563c, 0x03e8, 0x3f },
/*0x30*/ { BODY_STEWARD, 0x563d, 0x03e8, 0x3f },
/*0x31*/ { BODY_STEWARDESS, 0x563e, 0x03e8, 0x3f },
/*0x32*/ { BODY_STEWARDESS_COAT, 0x563f, 0x03e8, 0x3f },
/*0x33*/ { BODY_PRESIDENT, 0x5640, 0x003d, 0x41 },
/*0x34*/ { BODY_NSA_LACKEY, 0x5641, 0x03e8, 0x36 },
/*0x35*/ { BODY_PRES_SECURITY, 0x5642, 0x03e8, 0x43 },
/*0x36*/ { BODY_PRESIDENT_CLONE2, 0x5643, 0x003d, 0x42 },
/*0x37*/ { BODY_PELAGIC_GUARD, 0x5644, 0x03e8, 0x45 },
/*0x38*/ { BODY_MAIAN_SOLDIER, 0x5645, 0x0029, 0x3d },
/*0x39*/ { BODY_CONNERY, 0x5646, 0x03e8, 0x40 },
/*0x3a*/ { BODY_MOORE, 0x5646, 0x03e8, 0x40 },
/*0x3b*/ { BODY_DALTON, 0x5646, 0x03e8, 0x40 },
/*0x3c*/ { BODY_DJBOND, 0x5646, 0x03e8, 0x40 },
};
u32 var800879a4 = 0x00000011;