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

Rename scoreposition to placement

This commit is contained in:
Ryan Dwyer 2020-03-21 14:34:52 +10:00
parent 339436b8ed
commit cea671a96e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/data/data_020df0.c
View File

@ -10225,7 +10225,7 @@ u16 g_OrdinalSuffixes[] = {
// 2a950
struct menu_item menuitems_2a950[] = {
{ MENUITEMTYPE_LABEL, 0, 0x01000010, (u32)&mpGetCurrentPlayerName, (u32)&mpMenuTextScorePositionWithSuffix, menuhandler001785c4 },
{ MENUITEMTYPE_LABEL, 0, 0x01000010, (u32)&mpGetCurrentPlayerName, (u32)&mpMenuTextPlacementWithSuffix, menuhandler001785c4 },
{ MENUITEMTYPE_LABEL, 0, 0x01000000, L_MPMENU(261), (u32)&mpMenuTextPlayerTitle, menuhandler00178a94 }, // "Title:"
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPMENU(262), 0x00000000, NULL }, // "Weapon of Choice:"

4
src/game/game_177e00.c
View File

@ -336,11 +336,11 @@ char *mpMenuTextAward2(struct menu_item *item)
return g_Vars.players[g_MenuStack[g_MpPlayerNum].playernum]->award2;
}
char *mpMenuTextScorePositionWithSuffix(struct menu_item *item)
char *mpMenuTextPlacementWithSuffix(struct menu_item *item)
{
u16 suffixes[12] = g_OrdinalSuffixes;
return langGet(suffixes[g_MpPlayers[g_MpPlayerNum].base.scoreposition]);
return langGet(suffixes[g_MpPlayers[g_MpPlayerNum].base.placement]);
}
GLOBAL_ASM(

2
src/include/game/game_177e00.h
View File

@ -12,7 +12,7 @@ u32 func0f1783a0(void);
char *mpMenuTextWeaponOfChoiceName(struct menu_item *item);
char *mpMenuTextAward1(struct menu_item *item);
char *mpMenuTextAward2(struct menu_item *item);
char *mpMenuTextScorePositionWithSuffix(struct menu_item *item);
char *mpMenuTextPlacementWithSuffix(struct menu_item *item);
s32 menuhandler001785c4(u32, u32, u32 *);
s32 menuhandler001786d8(u32, u32, u32 *);
s32 menuhandler00178a94(u32, u32, u32 *);

2
src/include/types.h
View File

@ -4351,7 +4351,7 @@ struct mpchr {
/*0x14*/ u32 displayoptions;
/*0x18*/ u32 unk18;
/*0x1c*/ u16 unk1c;
/*0x1c*/ s8 scoreposition;
/*0x1c*/ s8 placement;
/*0x20*/ u32 unk20;
/*0x24*/ s16 unk24[12];
/*0x3c*/ s16 unk3c;