diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
| commit | 13efa1ef62b3e23e2b0662e318ed155893e17e88 (patch) | |
| tree | 57ae51e1b35c38d24d69e090dbf39b27a687d17b /include/script_menu.h | |
| parent | d31600e70e53fb252fe67e8c427ecb7498719b86 (diff) | |
| parent | 7defc27b994069715e5749245700d20dd740e4f0 (diff) | |
fixing conflicts
Diffstat (limited to 'include/script_menu.h')
| -rw-r--r-- | include/script_menu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/script_menu.h b/include/script_menu.h index 717eda041..0555d0f78 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -9,5 +9,8 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); +u8 convert_pixel_width_to_tile_width(s32); +u8 CreateWindowFromRect(u8, u8, u8, u8); +void sub_80E2A78(u8); #endif //GUARD_SCRIPT_MENU_H |