diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-16 14:01:31 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-16 14:01:31 -0600 |
| commit | 157b88b6dbfa7816cac9c6cf2ef20bd70a573b10 (patch) | |
| tree | 5ee8f522de06636ed00050c5fa2e2c776942a73d /src/battle_message.c | |
| parent | 11cb3275cc53c2bcea4fdcfe11d9d9d429ee9c02 (diff) | |
identity -> position
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index e37a4c30c..80aa5e3f9 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1834,25 +1834,25 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst) toCpy = gStringVar3; break; case B_TXT_PLAYER_MON1_NAME: // first player poke name - GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(IDENTITY_PLAYER_MON1)]], + GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(B_POSITION_PLAYER_LEFT)]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case B_TXT_OPPONENT_MON1_NAME: // first enemy poke name - GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(IDENTITY_OPPONENT_MON1)]], + GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(B_POSITION_OPPONENT_LEFT)]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case B_TXT_PLAYER_MON2_NAME: // second player poke name - GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(IDENTITY_PLAYER_MON2)]], + GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(B_POSITION_PLAYER_RIGHT)]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case B_TXT_OPPONENT_MON2_NAME: // second enemy poke name - GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(IDENTITY_OPPONENT_MON2)]], + GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(B_POSITION_OPPONENT_RIGHT)]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; |