Merge branch 'master' into pokeball-doc

1 files changed, 18 insertions, 16 deletions

diff --git a/src/move_relearner.c b/src/move_relearner.c
index 8c4cf7b2e..3e7caf133 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -150,20 +150,22 @@
 #define JAM_HEART_EMPTY 2
 #define JAM_HEART_FULL 3
 
+#define MAX_RELEARNER_MOVES (MAX_LEVEL_UP_MOVES > 25 ? MAX_LEVEL_UP_MOVES : 25)
+
 static EWRAM_DATA struct
 {
     u8 state;
-    u8 heartSpriteIds[16];              /*0x001*/
-    u16 movesToLearn[25];               /*0x01A*/
-    u8 partyMon;                        /*0x044*/
-    u8 moveSlot;                        /*0x045*/
-    struct ListMenuItem menuItems[25];  /*0x0E8*/
-    u8 numMenuChoices;                  /*0x110*/
-    u8 numToShowAtOnce;                 /*0x111*/
-    u8 moveListMenuTask;                /*0x112*/
-    u8 moveListScrollArrowTask;         /*0x113*/
-    u8 moveDisplayArrowTask;            /*0x114*/
-    u16 scrollOffset;                   /*0x116*/
+    u8 heartSpriteIds[16];                               /*0x001*/
+    u16 movesToLearn[MAX_RELEARNER_MOVES];               /*0x01A*/
+    u8 partyMon;                                         /*0x044*/
+    u8 moveSlot;                                         /*0x045*/
+    struct ListMenuItem menuItems[MAX_RELEARNER_MOVES];  /*0x0E8*/
+    u8 numMenuChoices;                                   /*0x110*/
+    u8 numToShowAtOnce;                                  /*0x111*/
+    u8 moveListMenuTask;                                 /*0x112*/
+    u8 moveListScrollArrowTask;                          /*0x113*/
+    u8 moveDisplayArrowTask;                             /*0x114*/
+    u16 scrollOffset;                                    /*0x116*/
 } *sMoveRelearnerStruct = {0};
 
 static EWRAM_DATA struct {
@@ -384,7 +386,7 @@ static void CB2_InitLearnMove(void)
     ResetSpriteData();
     FreeAllSpritePalettes();
     ResetTasks();
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct));
     sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004;
     SetVBlankCallback(VBlankCB_MoveRelearner);
@@ -412,7 +414,7 @@ static void CB2_InitLearnMoveReturnFromSelectMove(void)
     ResetSpriteData();
     FreeAllSpritePalettes();
     ResetTasks();
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct));
     sMoveRelearnerStruct->state = MENU_STATE_FADE_FROM_SUMMARY_SCREEN;
     sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004;
@@ -452,7 +454,7 @@ static void CB2_MoveRelearnerMain(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
@@ -713,13 +715,13 @@ static void DoMoveRelearnerMain(void)
         {
             FormatAndPrintText(gText_MoveRelearnerPkmnForgotMoveAndLearnedNew);
             sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE;
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
         }
         break;
     case MENU_STATE_PRINT_TEXT_THEN_FANFARE:
         if (!MoveRelearnerRunTextPrinters())
         {
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
             sMoveRelearnerStruct->state = MENU_STATE_WAIT_FOR_FANFARE;
         }
         break;