From cea671a96e3e7cb42e8d2c88a041f50af6d6ce33 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 21 Mar 2020 14:34:52 +1000 Subject: [PATCH] Rename scoreposition to placement --- src/game/data/data_020df0.c | 2 +- src/game/game_177e00.c | 4 ++-- src/include/game/game_177e00.h | 2 +- src/include/types.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 2d1533af7..d0993af4a 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -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:" diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index e82bc9f25..75f3a3228 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -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( diff --git a/src/include/game/game_177e00.h b/src/include/game/game_177e00.h index 86e490c80..2d02ad2b2 100644 --- a/src/include/game/game_177e00.h +++ b/src/include/game/game_177e00.h @@ -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 *); diff --git a/src/include/types.h b/src/include/types.h index b316698db..164ad73f9 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -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;