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
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -154,7 +154,7 @@ static EWRAM_DATA struct
 {
    u8 state;
    u8 heartSpriteIds[16];              /*0x001*/
-    u16 movesToLearn[4];                /*0x012*/
+    u16 movesToLearn[MAX_MON_MOVES];    /*0x012*/
    u8 filler1A[0x44 - 0x1A];           /*0x01A*/
    u8 partyMon;                        /*0x044*/
    u8 moveSlot;                        /*0x045*/