dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tData7 and tData8

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-27 14:23:03 -04:00
parent 3b98289de2
commit f998a7b661
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evolution_scene.c
+17 -17
View File
@@ -154,8 +154,8 @@ static void CB2_BeginEvolutionScene(void)
#define tBits data[3] #define tBits data[3]
#define tLearnsFirstMove data[4] #define tLearnsFirstMove data[4]
#define tLearnMoveState data[6] #define tLearnMoveState data[6]
#define tData7 data[7] #define tLearnMoveYesState data[7]
#define tData8 data[8] #define tLearnMoveNoState data[8]
#define tEvoWasStopped data[9] #define tEvoWasStopped data[9]
#define tPartyId data[10] #define tPartyId data[10]
@@ -847,8 +847,8 @@ static void Task_EvolutionScene(u8 taskId)
{ {
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0); BattlePutTextOnWindow(gDisplayedStringBattle, 0);
gTasks[taskId].tData7 = 5; gTasks[taskId].tLearnMoveYesState = 5;
gTasks[taskId].tData8 = 10; gTasks[taskId].tLearnMoveNoState = 10;
gTasks[taskId].tLearnMoveState++; gTasks[taskId].tLearnMoveState++;
} }
case 3: case 3:
@@ -883,11 +883,11 @@ static void Task_EvolutionScene(u8 taskId)
if (sEvoCursorPos != 0) if (sEvoCursorPos != 0)
{ {
gTasks[taskId].tLearnMoveState = gTasks[taskId].tData8; gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState;
} }
else else
{ {
gTasks[taskId].tLearnMoveState = gTasks[taskId].tData7; gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveYesState;
if (gTasks[taskId].tLearnMoveState == 5) if (gTasks[taskId].tLearnMoveState == 5)
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
} }
@@ -896,7 +896,7 @@ static void Task_EvolutionScene(u8 taskId)
{ {
HandleBattleWindow(0x17, 8, 0x1D, 0xD, WINDOW_CLEAR); HandleBattleWindow(0x17, 8, 0x1D, 0xD, WINDOW_CLEAR);
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gTasks[taskId].tLearnMoveState = gTasks[taskId].tData8; gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState;
} }
break; break;
case 5: case 5:
@@ -961,8 +961,8 @@ static void Task_EvolutionScene(u8 taskId)
case 10: case 10:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0); BattlePutTextOnWindow(gDisplayedStringBattle, 0);
gTasks[taskId].tData7 = 11; gTasks[taskId].tLearnMoveYesState = 11;
gTasks[taskId].tData8 = 0; gTasks[taskId].tLearnMoveNoState = 0;
gTasks[taskId].tLearnMoveState = 3; gTasks[taskId].tLearnMoveState = 3;
break; break;
case 11: case 11:
@@ -1211,8 +1211,8 @@ static void Task_TradeEvolutionScene(u8 taskId)
{ {
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tData7 = 5; gTasks[taskId].tLearnMoveYesState = 5;
gTasks[taskId].tData8 = 9; gTasks[taskId].tLearnMoveNoState = 9;
gTasks[taskId].tLearnMoveState++; gTasks[taskId].tLearnMoveState++;
} }
case 3: case 3:
@@ -1232,7 +1232,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
sEvoCursorPos = 0; sEvoCursorPos = 0;
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState = gTasks[taskId].tData7; gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveYesState;
if (gTasks[taskId].tLearnMoveState == 5) if (gTasks[taskId].tLearnMoveState == 5)
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
break; break;
@@ -1241,7 +1241,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
sEvoCursorPos = 1; sEvoCursorPos = 1;
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState = gTasks[taskId].tData8; gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState;
break; break;
} }
break; break;
@@ -1311,8 +1311,8 @@ static void Task_TradeEvolutionScene(u8 taskId)
case 9: case 9:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tData7 = 10; gTasks[taskId].tLearnMoveYesState = 10;
gTasks[taskId].tData8 = 0; gTasks[taskId].tLearnMoveNoState = 0;
gTasks[taskId].tLearnMoveState = 3; gTasks[taskId].tLearnMoveState = 3;
break; break;
case 10: case 10:
@@ -1336,8 +1336,8 @@ static void Task_TradeEvolutionScene(u8 taskId)
#undef tBits #undef tBits
#undef tLearnsFirstMove #undef tLearnsFirstMove
#undef tLearnMoveState #undef tLearnMoveState
#undef tData7 #undef tLearnMoveYesState
#undef tData8 #undef tLearnMoveNoState
#undef tEvoWasStopped #undef tEvoWasStopped
#undef tPartyId #undef tPartyId