Merge remote-tracking branch 'Shanty/script_macros'

2017-12-21 16:03:37 -06:00
parent a705a863d1 66f9d4c266
commit 2c0e5a41a2
266 changed files with 3052 additions and 3039 deletions
@@ -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();