Merge branch 'master' into gflib

2019-09-27 09:11:22 -04:00
parent 27aae9da9a 208e1c9689
commit 7b8b5b5c8c
217 changed files with 5479 additions and 5086 deletions
@@ -77,7 +77,7 @@ struct PyramidWildMon
    u16 species;
    u8 lvl;
    u8 abilityNum;
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
 };

 struct PyramidFloorTemplate