Merge remote-tracking branch 'pret/master'

2017-12-15 00:08:48 -06:00
parent 8e9428c482 c9f196cdfe
commit e3c366df64
188 changed files with 20683 additions and 24708 deletions
--- a/include/global.h
+++ b/include/global.h
@@ -288,7 +288,7 @@ struct SecretBaseRecord
    /*0x1B34*/ u8 partyEVs[6];
 };

-#include "game_stat.h"
+#include "constants/game_stat.h"
 #include "global.fieldmap.h"
 #include "global.berry.h"
 #include "global.tv.h"