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

Give songs meaningful english names

Browse Source
This commit is contained in:
GriffinR
2020-08-29 03:11:03 -04:00
parent c5839905a1
commit bb56d4a3f4
964 changed files with 8731 additions and 8814 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trainer_card.c
+6 -6
View File
@@ -543,7 +543,7 @@ static void Task_TrainerCard(u8 taskId)
case 8:
if (!UpdatePaletteFade() && !IsDma3ManagerBusyWithBgCopy())
{
PlaySE(SE_CARD3);
PlaySE(SE_CARD_OPEN);
sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_FRONT;
}
break;
@@ -564,7 +564,7 @@ static void Task_TrainerCard(u8 taskId)
{
SetHelpContext(HELPCONTEXT_TRAINER_CARD_BACK);
FlipTrainerCard();
PlaySE(SE_CARD1);
PlaySE(SE_CARD_FLIP);
sTrainerCardDataPtr->mainState = STATE_WAIT_FLIP_TO_BACK;
}
else if (JOY_NEW(B_BUTTON))
@@ -583,7 +583,7 @@ static void Task_TrainerCard(u8 taskId)
case STATE_WAIT_FLIP_TO_BACK:
if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE)
{
PlaySE(SE_CARD3);
PlaySE(SE_CARD_OPEN);
sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_BACK;
}
break;
@@ -604,7 +604,7 @@ static void Task_TrainerCard(u8 taskId)
SetHelpContext(HELPCONTEXT_TRAINER_CARD_FRONT);
FlipTrainerCard();
sTrainerCardDataPtr->mainState = STATE_WAIT_FLIP_TO_FRONT;
PlaySE(SE_CARD1);
PlaySE(SE_CARD_FLIP);
}
}
else if (JOY_NEW(A_BUTTON))
@@ -642,7 +642,7 @@ static void Task_TrainerCard(u8 taskId)
if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE)
{
sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_FRONT;
PlaySE(SE_CARD3);
PlaySE(SE_CARD_OPEN);
}
break;
}
@@ -1787,7 +1787,7 @@ static bool8 Task_SetCardFlipped(struct Task* task)
sTrainerCardDataPtr->onBack ^= 1;
task->tFlipState++;
sTrainerCardDataPtr->allowDMACopy = TRUE;
PlaySE(SE_CARD2);
PlaySE(SE_CARD_FLIPPING);
return FALSE;
}