Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-04-26 10:25:49 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix return to field when selecting a move to forget (#9000)

Browse Source
This commit is contained in:
FosterProgramming 2026-01-23 23:34:28 +01:00 committed by GitHub
parent 96e63e761a
commit 74d8af2286
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/field_specials.c
View File

@ -150,7 +150,7 @@ static u8 DidPlayerGetFirstFans(void);
static void SetInitialFansOfPlayer(void);
static u16 PlayerGainRandomTrainerFan(void);
static void CB2_ReturnToFieldWhileLearningMove(void);
static void Task_ReturnToFieldWhileLearningMove(void);
static void Task_ReturnToFieldWhileLearningMove(u8);
#if FREE_LINK_BATTLE_RECORDS == FALSE
static void BufferFanClubTrainerName_(struct LinkBattleRecords *, u8, u8);
#else
@ -4443,18 +4443,28 @@ void CanTeachMoveBoxMon(void)
gTasks[taskId].tMove = gSpecialVar_0x8005;
}
static void FieldCB_ContinueLearningMove(void)
{
LockPlayerFieldControls();
FadeInFromBlack();
CreateTask(Task_ReturnToFieldWhileLearningMove, 1);
}
static void CB2_ReturnToFieldWhileLearningMove(void)
{
gFieldCallback = Task_ReturnToFieldWhileLearningMove;
gFieldCallback = FieldCB_ContinueLearningMove;
CB2_ReturnToField();
}
static void Task_ReturnToFieldWhileLearningMove(void)
static void Task_ReturnToFieldWhileLearningMove(u8 taskId)
{
u32 taskId = CreateTask(Task_LearnMove, 1);
gTasks[taskId].tState = GetLearnMoveResumeAfterSummaryScreenState();
gTasks[taskId].tPartyIndex = gSpecialVar_0x8008;
gTasks[taskId].tMove = gSpecialVar_0x8009;
if (IsWeatherNotFadingIn() == TRUE)
{
gTasks[taskId].func = Task_LearnMove;
gTasks[taskId].tState = GetLearnMoveResumeAfterSummaryScreenState();
gTasks[taskId].tPartyIndex = gSpecialVar_0x8008;
gTasks[taskId].tMove = gSpecialVar_0x8009;
}
}
#undef tState