From 645830624d78f9241a43aaf1f09b483c8b5e9422 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 31 Oct 2018 23:03:41 -0500 Subject: Continue script_menu.c --- include/script_menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/script_menu.h') diff --git a/include/script_menu.h b/include/script_menu.h index 8870e80b9..8dd65263a 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -13,6 +13,6 @@ s32 convert_pixel_width_to_tile_width(s32); 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); +u32 sub_80E2D5C(u8 arg0, u8 tileWidth); #endif //GUARD_SCRIPT_MENU_H -- cgit v1.2.3 From 7dd4ed70601039d0c811752211b4aefa1d09b69b Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 5 Nov 2018 14:45:54 -0600 Subject: r5/r6 swap on sub_80E2578 --- include/script_menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/script_menu.h') diff --git a/include/script_menu.h b/include/script_menu.h index 8dd65263a..587e3e08b 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -13,6 +13,6 @@ s32 convert_pixel_width_to_tile_width(s32); u8 CreateWindowFromRect(u8, u8, u8, u8); void sub_80E2A78(u8); u32 display_text_and_get_width(const u8*, u32); -u32 sub_80E2D5C(u8 arg0, u8 tileWidth); +u32 sub_80E2D5C(u8 arg0, u32 tileWidth); #endif //GUARD_SCRIPT_MENU_H -- cgit v1.2.3 From 054a015c950ca9869ce28245a2f13c3f72cddb37 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 20:13:40 -0600 Subject: Finish decompiling/porting script_menu --- include/script_menu.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/script_menu.h') diff --git a/include/script_menu.h b/include/script_menu.h index 587e3e08b..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); -u32 sub_80E2D5C(u8 arg0, u32 tileWidth); +int display_text_and_get_width(const u8*, int); +int sub_80E2D5C(int arg0, int tileWidth); #endif //GUARD_SCRIPT_MENU_H -- cgit v1.2.3