diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-23 19:37:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-23 19:37:52 -0500 |
| commit | 2177f1f40b4dda2091ac3be3522c1bc4f6690e88 (patch) | |
| tree | e70fd1205a50891ebb8f4f402528873eee027096 /src/pokemon.c | |
| parent | 548490c675f68dfacf4d1939486c47d8405dddd8 (diff) | |
| parent | 14725e1592b3d7035cf1ee8720254ea2d312639c (diff) | |
Merge pull request #164 from PikalaxALT/dism_more_data
Battle Message et al
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 9aaddc142..8f9fe192c 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4796,9 +4796,9 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit) static void sub_8042D50(int stat) { gBattlerTarget = gBattlerInMenuId; - StringCopy(gBattleTextBuff1, gUnknown_83FD5D0[gUnknown_825DFF0[stat]]); - StringCopy(gBattleTextBuff2, BattleText_Rose); - BattleStringExpandPlaceholdersToDisplayedString(BattleText_UnknownString3); + StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_825DFF0[stat]]); + StringCopy(gBattleTextBuff2, gBattleText_Rose); + BattleStringExpandPlaceholdersToDisplayedString(gBattleText_UnknownString3); } const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId) @@ -4837,7 +4837,7 @@ const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId) else { gBattlerAttacker = gBattlerInMenuId; - BattleStringExpandPlaceholdersToDisplayedString(BattleText_GetPumped); + BattleStringExpandPlaceholdersToDisplayedString(gBattleText_GetPumped); } } } @@ -4845,7 +4845,7 @@ const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId) if (itemEffect[3] & 0x80) { gBattlerAttacker = gBattlerInMenuId; - BattleStringExpandPlaceholdersToDisplayedString(BattleText_MistShroud); + BattleStringExpandPlaceholdersToDisplayedString(gBattleText_MistShroud); } return gDisplayedStringBattle; |