Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd

This commit is contained in:
Diegoisawesome
2017-10-13 20:29:11 -05:00
106 changed files with 14610 additions and 25063 deletions

View File

@@ -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