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

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-25 09:22:50 +08:00
parent 6ca932e5e9 7579fc65c1
commit 2f87855072
136 changed files with 3963 additions and 6605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/item_use.c
+5 -5
View File
@@ -397,7 +397,7 @@ void FieldUseFunc_TmCase(u8 taskId)
}
else
{
sub_80CCB68();
StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = Task_InitTMCaseFromField;
}
@@ -428,7 +428,7 @@ void FieldUseFunc_BerryPouch(u8 taskId)
}
else
{
sub_80CCB68();
StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = Task_InitBerryPouchFromField;
}
@@ -471,7 +471,7 @@ void FieldUseFunc_TeachyTv(u8 taskId)
}
else
{
sub_80CCB68();
StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = Task_InitTeachyTvFromField;
}
@@ -601,7 +601,7 @@ void FieldUseFunc_TownMap(u8 taskId)
}
else
{
sub_80CCB68();
StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = sub_80A1CC0;
}
@@ -633,7 +633,7 @@ void FieldUseFunc_FameChecker(u8 taskId)
}
else
{
sub_80CCB68();
StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = sub_80A1D68;
}