diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-13 20:29:11 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-13 20:29:11 -0500 |
| commit | 924c0c6b5a9ceeb27fdc9e41e69d283c2b8d36d8 (patch) | |
| tree | 2c22380365ddf70f1432cac5f9cbede0bdef2abc /include/script_menu.h | |
| parent | 2852f4f1b86f1a5fbfdceb296d184158068b5ad5 (diff) | |
| parent | f6af9e7013107154df62d2eff53e3accb7a24b3d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd
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 f921a4348..717eda041 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -1,7 +1,7 @@ -#ifndef GUARD_SCRIPTMENU_H -#define GUARD_SCRIPTMENU_H +#ifndef GUARD_SCRIPT_MENU_H +#define GUARD_SCRIPT_MENU_H -extern const u8 *const gUnknown_0858BAF0[]; +extern const u8 *const gUnknown_0858BAF0[9]; bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5); @@ -10,4 +10,4 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 co bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); -#endif +#endif //GUARD_SCRIPT_MENU_H |