diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-18 22:15:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-18 22:15:38 -0800 |
| commit | 4a365e9230962daf875a0444d51d76639c07c827 (patch) | |
| tree | be7332caa25d9711fd12921e347332993e5b0ff1 /src/scene/evolution_scene.c | |
| parent | 8edb453c9de6459f4da78522b248a2e507ba1f08 (diff) | |
| parent | 79650185e2af1748a9728f6e9209d64f93cdb050 (diff) | |
Merge pull request #462 from ProjectRevoTPP/sprite_struct
change Sprite struct to use a data array instead of manual declares.
Diffstat (limited to 'src/scene/evolution_scene.c')
| -rw-r--r-- | src/scene/evolution_scene.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 4b73ab5b2..1bbb8d485 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -131,7 +131,7 @@ static void CB2_BeginEvolutionScene(void) #define tLearnsFirstMove data[6] #define tLearnMoveState data[8] #define tData9 data[9] -#define tData10 data[10] +#define tdata10 data[10] #define tEvoWasStopped data[11] #define tPartyID data[12] @@ -763,7 +763,7 @@ static void Task_EvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tData9 = 5; - gTasks[taskID].tData10 = 9; + gTasks[taskID].tdata10 = 9; gTasks[taskID].tLearnMoveState++; } case 3: @@ -797,7 +797,7 @@ static void Task_EvolutionScene(u8 taskID) sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); PlaySE(SE_SELECT); if (sEvoCursorPos != 0) - gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10; + gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; else { gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9; @@ -811,7 +811,7 @@ static void Task_EvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); PlaySE(SE_SELECT); - gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10; + gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; } break; case 5: @@ -874,7 +874,7 @@ static void Task_EvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tData9 = 10; - gTasks[taskID].tData10 = 0; + gTasks[taskID].tdata10 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 10: @@ -1077,7 +1077,7 @@ static void Task_TradeEvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]); sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tData9 = 5; - gTasks[taskID].tData10 = 9; + gTasks[taskID].tdata10 = 9; gTasks[taskID].tLearnMoveState++; } case 3: @@ -1116,7 +1116,7 @@ static void Task_TradeEvolutionScene(u8 taskID) sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); PlaySE(SE_SELECT); if (sEvoCursorPos != 0) - gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10; + gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; else { gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9; @@ -1131,7 +1131,7 @@ static void Task_TradeEvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); PlaySE(SE_SELECT); - gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10; + gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; } break; case 5: @@ -1194,7 +1194,7 @@ static void Task_TradeEvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]); sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tData9 = 10; - gTasks[taskID].tData10 = 0; + gTasks[taskID].tdata10 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 10: |