Merge pull request #752 from camthesaxman/emerald_diff

resolve some Emerald differences

1 files changed, 24 insertions, 24 deletions

diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index a51c08a0c..041fd292c 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -712,7 +712,7 @@ static void Task_EvolutionScene(u8 taskID)
         {
             sub_8024CEC();
             PlayFanfare(MUS_FANFA1);
-            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]);
             Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
             gTasks[taskID].tState++;
@@ -729,7 +729,7 @@ static void Task_EvolutionScene(u8 taskID)
             if (gUnknown_03004210.state == 0 && !IsSEPlaying())
             {
                 sub_8024CEC();
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[4]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[4]);
                 Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -737,7 +737,7 @@ static void Task_EvolutionScene(u8 taskID)
         case 1:
             if (gUnknown_03004210.state == 0 && !IsSEPlaying())
             {
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[5]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[5]);
                 Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -747,7 +747,7 @@ static void Task_EvolutionScene(u8 taskID)
                 break;
             if (!IsSEPlaying())
             {
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[6]);
                 Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
                 gTasks[taskID].tData9 = 5;
                 gTasks[taskID].tdata10 = 9;
@@ -780,7 +780,7 @@ static void Task_EvolutionScene(u8 taskID)
             if (gMain.newKeys & A_BUTTON)
             {
                 sub_8023AD8();
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]);
                 Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
                 PlaySE(SE_SELECT);
                 if (sEvoCursorPos != 0)
@@ -795,7 +795,7 @@ static void Task_EvolutionScene(u8 taskID)
             if (gMain.newKeys & B_BUTTON)
             {
                 sub_8023AD8();
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]);
                 Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
                 PlaySE(SE_SELECT);
                 gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10;
@@ -821,7 +821,7 @@ static void Task_EvolutionScene(u8 taskID)
                     u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
                     if (IsHMMove2(move))
                     {
-                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[307]);
+                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[307]);
                         Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
                         gTasks[taskID].tLearnMoveState = 11;
                     }
@@ -834,7 +834,7 @@ static void Task_EvolutionScene(u8 taskID)
                         gBattleTextBuff2[4] = EOS;
                         RemoveMonPPBonus(mon, var);
                         SetMonMoveSlot(mon, gMoveToLearn, var);
-                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[207]);
+                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[207]);
                         Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
                         gTasks[taskID].tLearnMoveState++;
                     }
@@ -844,7 +844,7 @@ static void Task_EvolutionScene(u8 taskID)
         case 7:
             if (gUnknown_03004210.state == 0 && !IsSEPlaying())
             {
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[7]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[7]);
                 Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -852,20 +852,20 @@ static void Task_EvolutionScene(u8 taskID)
         case 8:
             if (gUnknown_03004210.state == 0 && !IsSEPlaying())
             {
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[208]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[208]);
                 Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
                 gTasks[taskID].tState = 19;
             }
             break;
         case 9:
-            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[8]);
             Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
             gTasks[taskID].tData9 = 10;
             gTasks[taskID].tdata10 = 0;
             gTasks[taskID].tLearnMoveState = 3;
             break;
         case 10:
-            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[9]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[9]);
             Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
             gTasks[taskID].tState = 14;
             break;
@@ -1026,7 +1026,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         {
             sub_8024CEC();
             PlayFanfare(MUS_FANFA1);
-            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]);
             Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
             gTasks[taskID].tState++;
@@ -1043,7 +1043,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             if (gUnknown_03004828->window.state == 0 && !IsSEPlaying())
             {
                 sub_8024CEC();
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[4]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[4]);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -1051,7 +1051,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         case 1:
             if (gUnknown_03004828->window.state == 0 && !IsSEPlaying())
             {
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[5]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[5]);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -1061,7 +1061,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
                 break;
             if (!IsSEPlaying())
             {
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[6]);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 gTasks[taskID].tData9 = 5;
                 gTasks[taskID].tdata10 = 9;
@@ -1099,7 +1099,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             {
                 Text_EraseWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD);
                 DestroyMenuCursor();
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 PlaySE(SE_SELECT);
                 if (sEvoCursorPos != 0)
@@ -1115,7 +1115,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             {
                 Text_EraseWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD);
                 DestroyMenuCursor();
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 PlaySE(SE_SELECT);
                 gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10;
@@ -1141,7 +1141,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
                     u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
                     if (IsHMMove2(move))
                     {
-                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[307]);
+                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[307]);
                         Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                         gTasks[taskID].tLearnMoveState = 11;
                     }
@@ -1154,7 +1154,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
                         gBattleTextBuff2[4] = EOS;
                         RemoveMonPPBonus(mon, var);
                         SetMonMoveSlot(mon, gMoveToLearn, var);
-                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[207]);
+                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[207]);
                         Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                         gTasks[taskID].tLearnMoveState++;
                     }
@@ -1164,7 +1164,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         case 7:
             if (gUnknown_03004828->window.state == 0 && !IsSEPlaying())
             {
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[7]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[7]);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -1172,20 +1172,20 @@ static void Task_TradeEvolutionScene(u8 taskID)
         case 8:
             if (gUnknown_03004828->window.state == 0 && !IsSEPlaying())
             {
-                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[208]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[208]);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 gTasks[taskID].tState = 15;
             }
             break;
         case 9:
-            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[8]);
             Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             gTasks[taskID].tData9 = 10;
             gTasks[taskID].tdata10 = 0;
             gTasks[taskID].tLearnMoveState = 3;
             break;
         case 10:
-            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[9]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[9]);
             Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             gTasks[taskID].tState = 13;
             break;