diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:11:37 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:11:37 -0500 |
commit | ce5bc554e5739044af0c10eb6cc9231308fb28ce (patch) | |
tree | 9bbd647b96b9a44eb897174804bf324861e78874 /src/battle_message.c | |
parent | c63a889bf45d9cd6da0668703fad55941e531fa2 (diff) | |
parent | 39556605cd27a567a45bfc2c46af745ac031ab90 (diff) |
Merge branch 'doc-ttower' of https://github.com/GriffinRichards/pokefirered into doc-ttower
Diffstat (limited to 'src/battle_message.c')
-rw-r--r-- | src/battle_message.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index 196c1c3a6..d8367c75e 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -873,10 +873,10 @@ const u8 *const gBattleStringsTable[] = { gUnknown_83FDDEB, gUnknown_83FB484, gUnknown_83FB4BE, - Text_1A5CF1, - Text_1A5D31, - Text_1A5D6E, - Text_1A5DB1, + Text_MonSentToBoxInSomeonesPC, + Text_MonSentToBoxInBillsPC, + Text_MonSentToBoxSomeonesBoxFull, + Text_MonSentToBoxBillsBoxFull, sText_PokedudeUsedItem, gUnknown_83FDA4D, gUnknown_83FDA7A, @@ -1517,7 +1517,7 @@ void BufferStringBattle(u16 stringId) { if (gBattleTypeFlags & BATTLE_TYPE_GHOST) { - if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY) + if (gBattleTypeFlags & BATTLE_TYPE_GHOST_UNVEILED) stringPtr = gUnknown_83FD30D; else stringPtr = gUnknown_83FD2D9; |