diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-09 10:13:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 10:13:55 -0400 |
| commit | c40d7241ff2d2c0220550339b27a2725aac856fe (patch) | |
| tree | 05e2c9607d600aa3d36c9d3c8a3b2ca172b66a4c /src/item_use.c | |
| parent | ac38e814546eca637ea4bafe8792b8d38ff486a3 (diff) | |
| parent | 02aed8fc8e2496cc62873fc52de54c89f0b9ac83 (diff) | |
Merge pull request #294 from PikalaxALT/fldeff_flash
fldeff_flash.c
Diffstat (limited to 'src/item_use.c')
| -rw-r--r-- | src/item_use.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/item_use.c b/src/item_use.c index ec8155eb1..6f81ee0e3 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -41,6 +41,7 @@ #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" +#include "constants/field_weather.h" static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL; @@ -456,7 +457,7 @@ void FieldUseFunc_TmCase(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = Task_InitTMCaseFromField; } } @@ -487,7 +488,7 @@ void FieldUseFunc_BerryPouch(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = Task_InitBerryPouchFromField; } } @@ -530,7 +531,7 @@ void FieldUseFunc_TeachyTv(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = Task_InitTeachyTvFromField; } } @@ -660,7 +661,7 @@ void FieldUseFunc_TownMap(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = sub_80A1CC0; } } @@ -692,7 +693,7 @@ void FieldUseFunc_FameChecker(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = sub_80A1D68; } } |