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

Multiple changes 2

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-28 01:20:05 -04:00
parent f5e9cc595b
commit 0709da5867
45 changed files with 2277 additions and 2198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evolution_scene.c
+20 -20
View File
@@ -673,7 +673,7 @@ static void Task_EvolutionScene(u8 taskId)
ShowBg(2);
ShowBg(3);
break;
case EVOSTATE_INTRO_MSG: // print 'whoa, poke is evolving!!!' msg
case EVOSTATE_INTRO_MSG:
if (!gPaletteFade.active)
{
StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving);
@@ -681,7 +681,7 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tState++;
}
break;
case EVOSTATE_INTRO_MON_ANIM: // wait for string, animate mon(and play its cry)
case EVOSTATE_INTRO_MON_ANIM:
if (!IsTextPrinterActive(0))
{
PlayCry_Normal(gTasks[taskId].tPreEvoSpecies, 0);
@@ -695,7 +695,7 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tState++;
}
break;
case EVOSTATE_START_MUSIC: // play evolution music and fade screen black
case EVOSTATE_START_MUSIC:
if (!IsSEPlaying())
{
// Start music, fade background to black
@@ -704,7 +704,7 @@ static void Task_EvolutionScene(u8 taskId)
BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
}
break;
case EVOSTATE_START_BG_AND_SPARKLE_SPIRAL: // launch moving bg task, preapre evo sparkles
case EVOSTATE_START_BG_AND_SPARKLE_SPIRAL:
if (!gPaletteFade.active)
{
StartBgAnimation(FALSE);
@@ -712,7 +712,7 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tState++;
}
break;
case EVOSTATE_SPARKLE_ARC: // another set of evo sparkles
case EVOSTATE_SPARKLE_ARC:
if (!gTasks[sEvoGraphicsTaskId].isActive)
{
gTasks[taskId].tState++;
@@ -720,14 +720,14 @@ static void Task_EvolutionScene(u8 taskId)
sEvoGraphicsTaskId = EvolutionSparkles_ArcDown();
}
break;
case EVOSTATE_CYCLE_MON_SPRITE: // launch task that flashes pre evo with post evo sprites
case EVOSTATE_CYCLE_MON_SPRITE:
if (!gTasks[sEvoGraphicsTaskId].isActive)
{
sEvoGraphicsTaskId = CycleEvolutionMonSprite(sEvoStructPtr->preEvoSpriteId, sEvoStructPtr->postEvoSpriteId);
gTasks[taskId].tState++;
}
break;
case EVOSTATE_WAIT_CYCLE_MON_SPRITE: // wait for the above task to finish
case EVOSTATE_WAIT_CYCLE_MON_SPRITE:
if (--sEvoStructPtr->delayTimer == 0)
{
sEvoStructPtr->delayTimer = 3;
@@ -735,7 +735,7 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tState++;
}
break;
case EVOSTATE_SPARKLE_CIRCLE: // post evo sparkles
case EVOSTATE_SPARKLE_CIRCLE:
sEvoGraphicsTaskId = EvolutionSparkles_CircleInward();
gTasks[taskId].tState++;
break;
@@ -746,14 +746,14 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tState++;
}
break;
case EVOSTATE_EVO_SOUND: // play tu du sound after evolution
case EVOSTATE_EVO_SOUND:
if (!gTasks[sEvoGraphicsTaskId].isActive)
{
PlaySE(SE_EXP);
gTasks[taskId].tState++;
}
break;
case EVOSTATE_RESTORE_SCREEN: // stop music, return screen to pre-fade state
case EVOSTATE_RESTORE_SCREEN:
if (IsSEPlaying())
{
m4aMPlayAllStop();
@@ -763,14 +763,14 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tState++;
}
break;
case EVOSTATE_EVO_MON_ANIM: // animate mon
case EVOSTATE_EVO_MON_ANIM:
if (!gPaletteFade.active)
{
PlayCry_Normal(gTasks[taskId].tPostEvoSpecies, 0);
gTasks[taskId].tState++;
}
break;
case EVOSTATE_SET_MON_EVOLVED: // congratulations string and rename prompt
case EVOSTATE_SET_MON_EVOLVED:
if (IsCryFinished())
{
StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
@@ -785,7 +785,7 @@ static void Task_EvolutionScene(u8 taskId)
IncrementGameStat(GAME_STAT_EVOLVED_POKEMON);
}
break;
case EVOSTATE_TRY_LEARN_MOVE: // check if it wants to learn a new move
case EVOSTATE_TRY_LEARN_MOVE:
if (!IsTextPrinterActive(0))
{
HelpSystem_Enable();
@@ -816,7 +816,7 @@ static void Task_EvolutionScene(u8 taskId)
}
}
break;
case EVOSTATE_END: // task has finished, return
case EVOSTATE_END:
if (!gPaletteFade.active)
{
if (!(gTasks[taskId].tBits & TASK_BIT_LEARN_MOVE))
@@ -834,7 +834,7 @@ static void Task_EvolutionScene(u8 taskId)
SetMainCallback2(gCB2_AfterEvolution);
}
break;
case EVOSTATE_CANCEL: // evolution has been canceled, stop music and re-fade palette
case EVOSTATE_CANCEL:
if (!gTasks[sEvoGraphicsTaskId].isActive)
{
m4aMPlayAllStop();
@@ -842,14 +842,14 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tState++;
}
break;
case EVOSTATE_CANCEL_MON_ANIM: // animate pokemon trying to evolve again, evolution has been stopped
case EVOSTATE_CANCEL_MON_ANIM:
if (!gPaletteFade.active)
{
PlayCry_Normal(gTasks[taskId].tPreEvoSpecies, 0);
gTasks[taskId].tState++;
}
break;
case EVOSTATE_CANCEL_MSG: // after the animation, print the string 'WHOA IT DId NOT EVOLVE!!!'
case EVOSTATE_CANCEL_MSG:
if (IsCryFinished())
{
if (gTasks[taskId].tEvoWasStopped)
@@ -862,7 +862,7 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE;
}
break;
case EVOSTATE_LEARNED_MOVE: // pokemon learned a new move, print string and play a fanfare
case EVOSTATE_LEARNED_MOVE:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BufferMoveToLearnIntoBattleTextBuff2();
@@ -873,11 +873,11 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tState++;
}
break;
case EVOSTATE_TRY_LEARN_ANOTHER_MOVE: // wait a bit and check if can learn another move
case EVOSTATE_TRY_LEARN_ANOTHER_MOVE:
if (!IsTextPrinterActive(0) && !IsSEPlaying() && --gTasks[taskId].tLearnsFirstMove == 0)
gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE;
break;
case EVOSTATE_REPLACE_MOVE: // try to learn a new move
case EVOSTATE_REPLACE_MOVE:
switch (gTasks[taskId].tLearnMoveState)
{
case MVSTATE_INTRO_MSG_1: