diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:51:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 15:51:58 -0400 |
| commit | ebb6c4ee661758874972956a94eb06d38eaa18a8 (patch) | |
| tree | bccf414f4a854c2fd88290cbe5c221f56ba34f17 /src/battle_message.c | |
| parent | c0bc7e8f7b94ebab1e39b761aa194630e4c7bf6b (diff) | |
| parent | 9ff261ac2a249a669a42381509ef288287535b4f (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index efa4500c8..693058e2f 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1981,7 +1981,7 @@ void BufferStringBattle(u16 stringID) } else { - if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) + if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM) stringPtr = sText_Trainer1WantsToBattle; else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) stringPtr = sText_LinkTrainerWantsToBattlePause; @@ -2049,7 +2049,7 @@ void BufferStringBattle(u16 stringID) { if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))) stringPtr = sText_Trainer1SentOutPkmn; - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) + else if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM) stringPtr = sText_Trainer1SentOutPkmn; else stringPtr = sText_LinkTrainerSentOutPkmn; @@ -2110,7 +2110,7 @@ void BufferStringBattle(u16 stringID) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) stringPtr = sText_LinkTrainerMultiSentOutPkmn; - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) + else if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM) stringPtr = sText_Trainer1SentOutPkmn2; else stringPtr = sText_LinkTrainerSentOutPkmn2; @@ -2180,7 +2180,7 @@ void BufferStringBattle(u16 stringID) break; } } - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) + else if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM) { switch (gBattleTextBuff1[0]) { @@ -2495,8 +2495,8 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER1_CLASS: // trainer class name if (gBattleTypeFlags & BATTLE_TYPE_SECRET_BASE) toCpy = gTrainerClassNames[GetSecretBaseTrainerClass()]; - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) - toCpy = gTrainerClassNames[sub_8068BB0()]; + else if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM) + toCpy = gTrainerClassNames[GetUnionRoomTrainerClass()]; else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) toCpy = gTrainerClassNames[GetFrontierBrainTrainerClass()]; else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) @@ -2517,7 +2517,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) ConvertInternationalString(text, gBattleResources->secretBase->language); toCpy = text; } - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) + else if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM) { toCpy = gLinkPlayers[multiplayerId ^ BIT_SIDE].name; } |