diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:26:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:26:49 -0500 |
| commit | ea748ff7f51a7c119658930f878d046cc8b83c51 (patch) | |
| tree | 3616ea8ad0a2b3f05482ffd3b9db929a8b5f4573 /src/script_menu.c | |
| parent | 70c560cc84ec4152438815a7abae673ae6f589f8 (diff) | |
| parent | 293df1887f4b849e96d06530c722bd39afb7b72b (diff) | |
Merge pull request #1344 from GriffinRichards/doc-ec
Document easy chat and mail, script.c cleanup, add/use some general constants
Diffstat (limited to 'src/script_menu.c')
| -rw-r--r-- | src/script_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script_menu.c b/src/script_menu.c index 425cdc251..51c37b5b6 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -580,7 +580,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) u8 taskId; u8 spriteId; - if (FindTaskIdByFunc(Task_PokemonPicWindow) != 0xFF) + if (FindTaskIdByFunc(Task_PokemonPicWindow) != TASK_NONE) { return FALSE; } @@ -604,7 +604,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) { u8 taskId = FindTaskIdByFunc(Task_PokemonPicWindow); - if (taskId == 0xFF) + if (taskId == TASK_NONE) return NULL; gTasks[taskId].tState++; return IsPicboxClosed; @@ -612,7 +612,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) static bool8 IsPicboxClosed(void) { - if (FindTaskIdByFunc(Task_PokemonPicWindow) == 0xFF) + if (FindTaskIdByFunc(Task_PokemonPicWindow) == TASK_NONE) return TRUE; else return FALSE; |