diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
| commit | d004ce065c9cc6425df6f567dff39eb831f84875 (patch) | |
| tree | 2c20338324f10a553e78e731d999dd58669266c3 /src/battle_message.c | |
| parent | ec780bb2098be75e591b212e85947f88c91d4e37 (diff) | |
| parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into trade
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index f283d959c..112ab9630 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2857,7 +2857,7 @@ static void ChooseMoveUsedParticle(u8* textBuff) s32 counter = 0; u32 i = 0; - while (counter != 4) + while (counter != MAX_MON_MOVES) { if (sGrammarMoveUsedTable[i] == 0) counter++; @@ -2869,7 +2869,7 @@ static void ChooseMoveUsedParticle(u8* textBuff) { if (counter <= 2) StringCopy(textBuff, sText_SpaceIs); // is - else if (counter <= 4) + else if (counter <= MAX_MON_MOVES) StringCopy(textBuff, sText_ApostropheS); // 's } } @@ -2900,7 +2900,7 @@ static void ChooseTypeOfMoveUsedString(u8* dst) while (*dst != EOS) dst++; - while (counter != 4) + while (counter != MAX_MON_MOVES) { if (sGrammarMoveUsedTable[i] == MOVE_NONE) counter++; |