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

2018-10-21 00:20:09 +01:00
parent 7a072d4527 2a3ba78831
commit 3d8874d919
422 changed files with 7626 additions and 12999 deletions
--- a/src/data/pokemon/experience_tables.h
+++ b/src/data/pokemon/experience_tables.h
@@ -18,7 +18,7 @@
    :(n <= 36) ? ((n + 14)           * CUBE(n) / 50)        \
    :            (((n / 2) + 32)     * CUBE(n) / 50)

-const u32 gExperienceTables[][MAX_MON_LEVEL + 1] =
+const u32 gExperienceTables[][MAX_LEVEL + 1] =
 {
    { // Medium Fast
        0, // 0