diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /include/script_menu.h | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/script_menu.h')
| -rw-r--r-- | include/script_menu.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/script_menu.h b/include/script_menu.h index 8870e80b9..a6d52c31e 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -1,7 +1,7 @@ #ifndef GUARD_SCRIPT_MENU_H #define GUARD_SCRIPT_MENU_H -extern const u8 *const gUnknown_0858BAF0[9]; +extern const u8 *const gUnknown_0858BAF0[]; bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5); @@ -9,10 +9,10 @@ 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); -s32 convert_pixel_width_to_tile_width(s32); +int convert_pixel_width_to_tile_width(int); u8 CreateWindowFromRect(u8, u8, u8, u8); void sub_80E2A78(u8); -u32 display_text_and_get_width(const u8*, u32); -u8 sub_80E2D5C(u8 arg0, u8 tileWidth); +int display_text_and_get_width(const u8*, int); +int sub_80E2D5C(int arg0, int tileWidth); #endif //GUARD_SCRIPT_MENU_H |