Merge remote-tracking branch 'Shanty/script_macros'

This commit is contained in:
Diegoisawesome committed 2017-12-21 16:03:37 -06:00
commit 2c0e5a41a2
266 files changed
+3052 -3039

No files matched your search

+1 -1
View File
@@ -2089,7 +2089,7 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_choosecontestpkmn(struct ScriptContext *ctx)
bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
{
sub_81B9404();
ScriptContext1_Stop();