Fixed typo in sMoveRelearnerMenuState (pret#2155)

PippoFranco201 · PippoFranco201 · commit fa60a5ace44c · 2025-06-17T18:43:43.000+02:00
diff --git a/include/global.h b/include/global.h
@@ -518,6 +518,7 @@ struct SaveBlock2
              u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET]
              u16 optionsBattleSceneOff:1; // whether battle animations are disabled
              u16 regionMapZoom:1; // whether the map is zoomed in
+             u16 expShare:1;
              //u16 padding1:4;
              //u16 padding2;
     /*0x18*/ struct Pokedex pokedex;
diff --git a/include/item_use.h b/include/item_use.h
@@ -1,34 +1,36 @@
 #ifndef GUARD_ITEM_USE_H
 #define GUARD_ITEM_USE_H
 
-void ItemUseOutOfBattle_Mail(u8 taskId);
-void ItemUseOutOfBattle_Bike(u8 taskId);
-void ItemUseOutOfBattle_Rod(u8 taskId);
-void ItemUseOutOfBattle_Itemfinder(u8 var);
-void ItemUseOutOfBattle_PokeblockCase(u8 taskId);
-void ItemUseOutOfBattle_CoinCase(u8 taskId);
-void ItemUseOutOfBattle_PowderJar(u8 taskId);
-void ItemUseOutOfBattle_WailmerPail(u8 taskId);
-void ItemUseOutOfBattle_Medicine(u8 taskId);
-void ItemUseOutOfBattle_ReduceEV(u8 taskId);
-void ItemUseOutOfBattle_SacredAsh(u8 taskId);
-void ItemUseOutOfBattle_PPRecovery(u8 taskId);
-void ItemUseOutOfBattle_PPUp(u8 taskId);
-void ItemUseOutOfBattle_RareCandy(u8 taskId);
-void ItemUseOutOfBattle_TMHM(u8 taskId);
-void ItemUseOutOfBattle_Repel(u8 taskId);
-void ItemUseOutOfBattle_EscapeRope(u8 taskId);
-void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId);
-void ItemUseOutOfBattle_EvolutionStone(u8 taskId);
-void ItemUseOutOfBattle_Berry(u8 taskId);
-void ItemUseOutOfBattle_EnigmaBerry(u8 taskId);
-void ItemUseOutOfBattle_CannotUse(u8 taskId);
-void ItemUseInBattle_PokeBall(u8 taskId);
-void ItemUseInBattle_StatIncrease(u8 taskId);
-void ItemUseInBattle_Medicine(u8 taskId);
-void ItemUseInBattle_PPRecovery(u8 taskId);
-void ItemUseInBattle_Escape(u8 taskId);
-void ItemUseInBattle_EnigmaBerry(u8 taskId);
+void ItemUseOutOfBattle_Mail(u8);
+void ItemUseOutOfBattle_Bike(u8);
+void ItemUseOutOfBattle_Rod(u8);
+void ItemUseOutOfBattle_Itemfinder(u8);
+void ItemUseOutOfBattle_PokeblockCase(u8);
+void ItemUseOutOfBattle_CoinCase(u8);
+void ItemUseOutOfBattle_PowderJar(u8);
+void ItemUseOutOfBattle_SSTicket(u8);
+void ItemUseOutOfBattle_WailmerPail(u8);
+void ItemUseOutOfBattle_Medicine(u8);
+void ItemUseOutOfBattle_ReduceEV(u8);
+void ItemUseOutOfBattle_SacredAsh(u8);
+void ItemUseOutOfBattle_PPRecovery(u8);
+void ItemUseOutOfBattle_PPUp(u8);
+void ItemUseOutOfBattle_RareCandy(u8);
+void ItemUseOutOfBattle_TMHM(u8);
+void ItemUseOutOfBattle_Repel(u8);
+void ItemUseOutOfBattle_EscapeRope(u8);
+void ItemUseOutOfBattle_BlackWhiteFlute(u8);
+void ItemUseOutOfBattle_EvolutionStone(u8);
+void ItemUseOutOfBattle_Berry(u8);
+void ItemUseOutOfBattle_EnigmaBerry(u8);
+void ItemUseOutOfBattle_CannotUse(u8);
+void ItemUseOutOfBattle_ExpShare(u8);
+void ItemUseInBattle_PokeBall(u8);
+void ItemUseInBattle_StatIncrease(u8);
+void ItemUseInBattle_Medicine(u8);
+void ItemUseInBattle_PPRecovery(u8);
+void ItemUseInBattle_Escape(u8);
+void ItemUseInBattle_EnigmaBerry(u8);
 void Task_UseDigEscapeRopeOnField(u8 taskId);
 bool8 CanUseDigOrEscapeRopeOnCurMap(void);
 u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
diff --git a/include/strings.h b/include/strings.h
@@ -3019,6 +3019,10 @@ extern const u8 gText_PkmnForSwap[];
 extern const u8 gText_SamePkmnInPartyAlready[];
 extern const u8 gText_Cancel3[];
 
+// Exp. Share
+extern const u8 gText_ExpShareOn[];
+extern const u8 gText_ExpShareOff[];
+
 // Naming Screen
 extern const u8 gText_MoveOkBack[];
 extern const u8 gText_YourName[];
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
@@ -3258,7 +3258,6 @@ static void Cmd_getexp(void)
     s32 i; // also used as stringId
     u8 holdEffect;
     s32 sentIn;
-    s32 viaExpShare = 0;
     u16 *exp = &gBattleStruct->expValue;
 
     gBattlerFainted = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
@@ -3302,20 +3301,17 @@ static void Cmd_getexp(void)
                     holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
                 else
                     holdEffect = GetItemHoldEffect(item);
-
-                if (holdEffect == HOLD_EFFECT_EXP_SHARE)
-                    viaExpShare++;
             }
 
             calculatedExp = gSpeciesInfo[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 7;
 
-            if (viaExpShare) // at least one mon is getting exp via exp share
+            if (gSaveBlock2Ptr->expShare) // exp share is turned on
             {
                 *exp = SAFE_DIV(calculatedExp / 2, viaSentIn);
                 if (*exp == 0)
                     *exp = 1;
 
-                gExpShareExp = calculatedExp / 2 / viaExpShare;
+                gExpShareExp = calculatedExp / 2;
                 if (gExpShareExp == 0)
                     gExpShareExp = 1;
             }
@@ -3342,7 +3338,7 @@ static void Cmd_getexp(void)
             else
                 holdEffect = GetItemHoldEffect(item);
 
-            if (holdEffect != HOLD_EFFECT_EXP_SHARE && !(gBattleStruct->sentInPokes & 1))
+            if (!gSaveBlock2Ptr->expShare && !(gBattleStruct->sentInPokes & 1))
             {
                 *(&gBattleStruct->sentInPokes) >>= 1;
                 gBattleScripting.getexpState = 5;
@@ -3364,14 +3360,14 @@ static void Cmd_getexp(void)
                     gBattleStruct->wildVictorySong++;
                 }
 
-                if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP))
+                if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && !GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_IS_EGG))
                 {
                     if (gBattleStruct->sentInPokes & 1)
                         gBattleMoveDamage = *exp;
                     else
                         gBattleMoveDamage = 0;
 
-                    if (holdEffect == HOLD_EFFECT_EXP_SHARE)
+                    if (gSaveBlock2Ptr->expShare)
                         gBattleMoveDamage += gExpShareExp;
                     if (holdEffect == HOLD_EFFECT_LUCKY_EGG)
                         gBattleMoveDamage = (gBattleMoveDamage * 150) / 100;
diff --git a/src/data/items.h b/src/data/items.h
@@ -2227,9 +2227,9 @@ const struct Item gItems[] =
         .price = 3000,
         .holdEffect = HOLD_EFFECT_EXP_SHARE,
         .description = sExpShareDesc,
-        .pocket = POCKET_ITEMS,
-        .type = ITEM_USE_BAG_MENU,
-        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
+        .pocket = POCKET_KEY_ITEMS,
+        .type = ITEM_USE_FIELD,
+        .fieldUseFunc = ItemUseOutOfBattle_ExpShare,
     },
 
     [ITEM_QUICK_CLAW] =
diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h
@@ -730,7 +730,7 @@ static const u8 sMachoBraceDesc[] = _(
 
 static const u8 sExpShareDesc[] = _(
     "A hold item that\n"
-    "gets EXP. points\n"
+    "spreads experience\n"
     "from battles.");
 
 static const u8 sQuickClawDesc[] = _(
diff --git a/src/item_use.c b/src/item_use.c
@@ -197,6 +197,27 @@ void ItemUseOutOfBattle_Mail(u8 taskId)
     Task_FadeAndCloseBagMenu(taskId);
 }
 
+void ItemUseOutOfBattle_ExpShare(u8 taskId)
+{
+    if (!gSaveBlock2Ptr->expShare)
+    {
+        PlaySE(SE_EXP_MAX);
+        if (gTasks[taskId].tUsingRegisteredKeyItem) // to account for pressing select in the overworld
+            DisplayItemMessageOnField(taskId, gText_ExpShareOn, Task_CloseCantUseKeyItemMessage);
+        else
+            DisplayItemMessage(taskId, 1, gText_ExpShareOn, CloseItemMessage);
+    }
+    else
+    {
+        PlaySE(SE_PC_OFF);
+        if (gTasks[taskId].tUsingRegisteredKeyItem) // to account for pressing select in the overworld
+            DisplayItemMessageOnField(taskId, gText_ExpShareOff, Task_CloseCantUseKeyItemMessage);
+        else
+            DisplayItemMessage(taskId, 1, gText_ExpShareOff, CloseItemMessage);
+    }
+    gSaveBlock2Ptr->expShare = !gSaveBlock2Ptr->expShare;
+}
+
 void ItemUseOutOfBattle_Bike(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
diff --git a/src/move_relearner.c b/src/move_relearner.c
@@ -179,7 +179,7 @@ static EWRAM_DATA struct {
     u16 listOffset;
     u16 listRow;
     bool8 showContestInfo;
-} sMoveRelearnerMenuSate = {0};
+} sMoveRelearnerMenuState = {0};
 
 static const u16 sUI_Pal[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal");
 
@@ -401,17 +401,17 @@ static void CB2_InitLearnMove(void)
     InitMoveRelearnerBackgroundLayers();
     InitMoveRelearnerWindows(FALSE);
 
-    sMoveRelearnerMenuSate.listOffset = 0;
-    sMoveRelearnerMenuSate.listRow = 0;
-    sMoveRelearnerMenuSate.showContestInfo = FALSE;
+    sMoveRelearnerMenuState.listOffset = 0;
+    sMoveRelearnerMenuState.listRow = 0;
+    sMoveRelearnerMenuState.showContestInfo = FALSE;
 
     CreateLearnableMovesList();
 
     LoadSpriteSheet(&sMoveRelearnerSpriteSheet);
     LoadSpritePalette(&sMoveRelearnerPalette);
     CreateUISprites();
 
-    sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow);
+    sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuState.listOffset, sMoveRelearnerMenuState.listRow);
     SetBackdropFromColor(RGB_BLACK);
     SetMainCallback2(CB2_MoveRelearnerMain);
 }
@@ -429,14 +429,14 @@ static void CB2_InitLearnMoveReturnFromSelectMove(void)
     SetVBlankCallback(VBlankCB_MoveRelearner);
 
     InitMoveRelearnerBackgroundLayers();
-    InitMoveRelearnerWindows(sMoveRelearnerMenuSate.showContestInfo);
+    InitMoveRelearnerWindows(sMoveRelearnerMenuState.showContestInfo);
     CreateLearnableMovesList();
 
     LoadSpriteSheet(&sMoveRelearnerSpriteSheet);
     LoadSpritePalette(&sMoveRelearnerPalette);
     CreateUISprites();
 
-    sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow);
+    sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuState.listOffset, sMoveRelearnerMenuState.listRow);
     SetBackdropFromColor(RGB_BLACK);
     SetMainCallback2(CB2_MoveRelearnerMain);
 }
@@ -533,11 +533,11 @@ static void DoMoveRelearnerMain(void)
             }
             else if (selection == MENU_B_PRESSED || selection == 1)
             {
-                if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
+                if (sMoveRelearnerMenuState.showContestInfo == FALSE)
                 {
                     sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
                 }
-                else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
+                else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
                 {
                     sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
                 }
@@ -562,11 +562,11 @@ static void DoMoveRelearnerMain(void)
             }
             else if (selection == MENU_B_PRESSED || selection == 1)
             {
-                if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
+                if (sMoveRelearnerMenuState.showContestInfo == FALSE)
                 {
                     sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
                 }
-                else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
+                else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
                 {
                     sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
                 }
@@ -622,11 +622,11 @@ static void DoMoveRelearnerMain(void)
             else if (selection == MENU_B_PRESSED || selection == 1)
             {
                 // What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway.
-                if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
+                if (sMoveRelearnerMenuState.showContestInfo == FALSE)
                 {
                     sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
                 }
-                else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
+                else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
                 {
                     sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
                 }
@@ -638,11 +638,11 @@ static void DoMoveRelearnerMain(void)
         if (!MoveRelearnerRunTextPrinters())
         {
             FillWindowPixelBuffer(RELEARNERWIN_MSG, 0x11);
-            if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
+            if (sMoveRelearnerMenuState.showContestInfo == FALSE)
             {
                 sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
             }
-            else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
+            else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
             {
                 sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
             }
@@ -685,11 +685,11 @@ static void DoMoveRelearnerMain(void)
     case MENU_STATE_FADE_FROM_SUMMARY_SCREEN:
         BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
         sMoveRelearnerStruct->state++;
-        if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
+        if (sMoveRelearnerMenuState.showContestInfo == FALSE)
         {
             HideHeartSpritesAndShowTeachMoveText(TRUE);
         }
-        else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
+        else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
         {
             ShowTeachMoveText(TRUE);
         }
@@ -751,7 +751,7 @@ static void DoMoveRelearnerMain(void)
 static void FreeMoveRelearnerResources(void)
 {
     RemoveScrollArrows();
-    DestroyListMenuTask(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow);
+    DestroyListMenuTask(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuState.listOffset, &sMoveRelearnerMenuState.listRow);
     FreeAllWindowBuffers();
     FREE_AND_SET_NULL(sMoveRelearnerStruct);
     ResetSpriteData();
@@ -778,7 +778,7 @@ static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites)
 static void HandleInput(bool8 showContest)
 {
     s32 itemId = ListMenu_ProcessInput(sMoveRelearnerStruct->moveListMenuTask);
-    ListMenuGetScrollAndRow(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow);
+    ListMenuGetScrollAndRow(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuState.listOffset, &sMoveRelearnerMenuState.listRow);
 
     switch (itemId)
     {
@@ -792,13 +792,13 @@ static void HandleInput(bool8 showContest)
         {
             PutWindowTilemap(RELEARNERWIN_DESC_CONTEST);
             sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
-            sMoveRelearnerMenuSate.showContestInfo = TRUE;
+            sMoveRelearnerMenuState.showContestInfo = TRUE;
         }
         else
         {
             PutWindowTilemap(RELEARNERWIN_DESC_BATTLE);
             sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
-            sMoveRelearnerMenuSate.showContestInfo = FALSE;
+            sMoveRelearnerMenuState.showContestInfo = FALSE;
         }
 
         ScheduleBgCopyTilemapToVram(1);
@@ -824,7 +824,7 @@ static void HandleInput(bool8 showContest)
 
 static s32 GetCurrentSelectedMove(void)
 {
-    return sMoveRelearnerStruct->menuItems[sMoveRelearnerMenuSate.listRow + sMoveRelearnerMenuSate.listOffset].id;
+    return sMoveRelearnerStruct->menuItems[sMoveRelearnerMenuState.listRow + sMoveRelearnerMenuState.listOffset].id;
 }
 
 // Theory: This used to make the heart sprites visible again (i.e.
@@ -876,7 +876,7 @@ static void AddScrollArrows(void)
     {
         gTempScrollArrowTemplate = sMoveListScrollArrowsTemplate;
         gTempScrollArrowTemplate.fullyDownThreshold = sMoveRelearnerStruct->numMenuChoices - sMoveRelearnerStruct->numToShowAtOnce;
-        sMoveRelearnerStruct->moveListScrollArrowTask = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sMoveRelearnerMenuSate.listOffset);
+        sMoveRelearnerStruct->moveListScrollArrowTask = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sMoveRelearnerMenuState.listOffset);
     }
 }
 
@@ -921,7 +921,7 @@ void MoveRelearnerShowHideHearts(s32 move)
     u16 numHearts;
     u16 i;
 
-    if (!sMoveRelearnerMenuSate.showContestInfo || move == LIST_CANCEL)
+    if (!sMoveRelearnerMenuState.showContestInfo || move == LIST_CANCEL)
     {
         for (i = 0; i < 16; i++)
             gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE;
diff --git a/src/new_game.c b/src/new_game.c
@@ -204,6 +204,7 @@ void NewGameInitData(void)
     WipeTrainerNameRecords();
     ResetTrainerHillResults();
     ResetContestLinkResults();
+    gSaveBlock2Ptr->expShare = 0;
 }
 
 static void ResetMiniGamesRecords(void)
diff --git a/src/strings.c b/src/strings.c
@@ -1819,3 +1819,7 @@ const u8 gText_Answer[] = _("ANSWER");
 const u8 gText_PokeBalls[] = _("POKé BALLS");
 const u8 gText_Berry[] = _("BERRY");
 const u8 gText_Berries[] = _("BERRIES");
+
+// Exp. Share
+const u8 gText_ExpShareOn[] = _("Turned on the Exp. Share.\pParty will now gain a portion\nof the Experience Points.{PAUSE_UNTIL_PRESS}");
+const u8 gText_ExpShareOff[] = _("Turned off the Exp. Share.\pParty will no longer gain a portion\nof any Experience Points.{PAUSE_UNTIL_PRESS}");

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ static EWRAM_DATA struct {`
`179`	`179`	`u16 listOffset;`
`180`	`180`	`u16 listRow;`
`181`	`181`	`bool8 showContestInfo;`
`182`		`-} sMoveRelearnerMenuSate = {0};`
	`182`	`+} sMoveRelearnerMenuState = {0};`
`183`	`183`
`184`	`184`	`static const u16 sUI_Pal[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal");`
`185`	`185`
`@@ -401,17 +401,17 @@ static void CB2_InitLearnMove(void)`
`401`	`401`	`InitMoveRelearnerBackgroundLayers();`
`402`	`402`	`InitMoveRelearnerWindows(FALSE);`
`403`	`403`
`404`		`- sMoveRelearnerMenuSate.listOffset = 0;`
`405`		`- sMoveRelearnerMenuSate.listRow = 0;`
`406`		`- sMoveRelearnerMenuSate.showContestInfo = FALSE;`
	`404`	`+ sMoveRelearnerMenuState.listOffset = 0;`
	`405`	`+ sMoveRelearnerMenuState.listRow = 0;`
	`406`	`+ sMoveRelearnerMenuState.showContestInfo = FALSE;`
`407`	`407`
`408`	`408`	`CreateLearnableMovesList();`
`409`	`409`
`410`	`410`	`LoadSpriteSheet(&sMoveRelearnerSpriteSheet);`
`411`	`411`	`LoadSpritePalette(&sMoveRelearnerPalette);`
`412`	`412`	`CreateUISprites();`
`413`	`413`
`414`		`- sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow);`
	`414`	`+ sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuState.listOffset, sMoveRelearnerMenuState.listRow);`
`415`	`415`	`SetBackdropFromColor(RGB_BLACK);`
`416`	`416`	`SetMainCallback2(CB2_MoveRelearnerMain);`
`417`	`417`	`}`
`@@ -429,14 +429,14 @@ static void CB2_InitLearnMoveReturnFromSelectMove(void)`
`429`	`429`	`SetVBlankCallback(VBlankCB_MoveRelearner);`
`430`	`430`
`431`	`431`	`InitMoveRelearnerBackgroundLayers();`
`432`		`- InitMoveRelearnerWindows(sMoveRelearnerMenuSate.showContestInfo);`
	`432`	`+ InitMoveRelearnerWindows(sMoveRelearnerMenuState.showContestInfo);`
`433`	`433`	`CreateLearnableMovesList();`
`434`	`434`
`435`	`435`	`LoadSpriteSheet(&sMoveRelearnerSpriteSheet);`
`436`	`436`	`LoadSpritePalette(&sMoveRelearnerPalette);`
`437`	`437`	`CreateUISprites();`
`438`	`438`
`439`		`- sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow);`
	`439`	`+ sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuState.listOffset, sMoveRelearnerMenuState.listRow);`
`440`	`440`	`SetBackdropFromColor(RGB_BLACK);`
`441`	`441`	`SetMainCallback2(CB2_MoveRelearnerMain);`
`442`	`442`	`}`
`@@ -533,11 +533,11 @@ static void DoMoveRelearnerMain(void)`
`533`	`533`	`}`
`534`	`534`	`else if (selection == MENU_B_PRESSED \|\| selection == 1)`
`535`	`535`	`{`
`536`		`- if (sMoveRelearnerMenuSate.showContestInfo == FALSE)`
	`536`	`+ if (sMoveRelearnerMenuState.showContestInfo == FALSE)`
`537`	`537`	`{`
`538`	`538`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;`
`539`	`539`	`}`
`540`		`- else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)`
	`540`	`+ else if (sMoveRelearnerMenuState.showContestInfo == TRUE)`
`541`	`541`	`{`
`542`	`542`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;`
`543`	`543`	`}`
`@@ -562,11 +562,11 @@ static void DoMoveRelearnerMain(void)`
`562`	`562`	`}`
`563`	`563`	`else if (selection == MENU_B_PRESSED \|\| selection == 1)`
`564`	`564`	`{`
`565`		`- if (sMoveRelearnerMenuSate.showContestInfo == FALSE)`
	`565`	`+ if (sMoveRelearnerMenuState.showContestInfo == FALSE)`
`566`	`566`	`{`
`567`	`567`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;`
`568`	`568`	`}`
`569`		`- else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)`
	`569`	`+ else if (sMoveRelearnerMenuState.showContestInfo == TRUE)`
`570`	`570`	`{`
`571`	`571`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;`
`572`	`572`	`}`
`@@ -622,11 +622,11 @@ static void DoMoveRelearnerMain(void)`
`622`	`622`	`else if (selection == MENU_B_PRESSED \|\| selection == 1)`
`623`	`623`	`{`
`624`	`624`	`// What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway.`
`625`		`- if (sMoveRelearnerMenuSate.showContestInfo == FALSE)`
	`625`	`+ if (sMoveRelearnerMenuState.showContestInfo == FALSE)`
`626`	`626`	`{`
`627`	`627`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;`
`628`	`628`	`}`
`629`		`- else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)`
	`629`	`+ else if (sMoveRelearnerMenuState.showContestInfo == TRUE)`
`630`	`630`	`{`
`631`	`631`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;`
`632`	`632`	`}`
`@@ -638,11 +638,11 @@ static void DoMoveRelearnerMain(void)`
`638`	`638`	`if (!MoveRelearnerRunTextPrinters())`
`639`	`639`	`{`
`640`	`640`	`FillWindowPixelBuffer(RELEARNERWIN_MSG, 0x11);`
`641`		`- if (sMoveRelearnerMenuSate.showContestInfo == FALSE)`
	`641`	`+ if (sMoveRelearnerMenuState.showContestInfo == FALSE)`
`642`	`642`	`{`
`643`	`643`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;`
`644`	`644`	`}`
`645`		`- else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)`
	`645`	`+ else if (sMoveRelearnerMenuState.showContestInfo == TRUE)`
`646`	`646`	`{`
`647`	`647`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;`
`648`	`648`	`}`
`@@ -685,11 +685,11 @@ static void DoMoveRelearnerMain(void)`
`685`	`685`	`case MENU_STATE_FADE_FROM_SUMMARY_SCREEN:`
`686`	`686`	`BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);`
`687`	`687`	`sMoveRelearnerStruct->state++;`
`688`		`- if (sMoveRelearnerMenuSate.showContestInfo == FALSE)`
	`688`	`+ if (sMoveRelearnerMenuState.showContestInfo == FALSE)`
`689`	`689`	`{`
`690`	`690`	`HideHeartSpritesAndShowTeachMoveText(TRUE);`
`691`	`691`	`}`
`692`		`- else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)`
	`692`	`+ else if (sMoveRelearnerMenuState.showContestInfo == TRUE)`
`693`	`693`	`{`
`694`	`694`	`ShowTeachMoveText(TRUE);`
`695`	`695`	`}`
`@@ -751,7 +751,7 @@ static void DoMoveRelearnerMain(void)`
`751`	`751`	`static void FreeMoveRelearnerResources(void)`
`752`	`752`	`{`
`753`	`753`	`RemoveScrollArrows();`
`754`		`- DestroyListMenuTask(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow);`
	`754`	`+ DestroyListMenuTask(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuState.listOffset, &sMoveRelearnerMenuState.listRow);`
`755`	`755`	`FreeAllWindowBuffers();`
`756`	`756`	`FREE_AND_SET_NULL(sMoveRelearnerStruct);`
`757`	`757`	`ResetSpriteData();`
`@@ -778,7 +778,7 @@ static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites)`
`778`	`778`	`static void HandleInput(bool8 showContest)`
`779`	`779`	`{`
`780`	`780`	`s32 itemId = ListMenu_ProcessInput(sMoveRelearnerStruct->moveListMenuTask);`
`781`		`- ListMenuGetScrollAndRow(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow);`
	`781`	`+ ListMenuGetScrollAndRow(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuState.listOffset, &sMoveRelearnerMenuState.listRow);`
`782`	`782`
`783`	`783`	`switch (itemId)`
`784`	`784`	`{`
`@@ -792,13 +792,13 @@ static void HandleInput(bool8 showContest)`
`792`	`792`	`{`
`793`	`793`	`PutWindowTilemap(RELEARNERWIN_DESC_CONTEST);`
`794`	`794`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;`
`795`		`- sMoveRelearnerMenuSate.showContestInfo = TRUE;`
	`795`	`+ sMoveRelearnerMenuState.showContestInfo = TRUE;`
`796`	`796`	`}`
`797`	`797`	`else`
`798`	`798`	`{`
`799`	`799`	`PutWindowTilemap(RELEARNERWIN_DESC_BATTLE);`
`800`	`800`	`sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;`
`801`		`- sMoveRelearnerMenuSate.showContestInfo = FALSE;`
	`801`	`+ sMoveRelearnerMenuState.showContestInfo = FALSE;`
`802`	`802`	`}`
`803`	`803`
`804`	`804`	`ScheduleBgCopyTilemapToVram(1);`
`@@ -824,7 +824,7 @@ static void HandleInput(bool8 showContest)`
`824`	`824`
`825`	`825`	`static s32 GetCurrentSelectedMove(void)`
`826`	`826`	`{`
`827`		`- return sMoveRelearnerStruct->menuItems[sMoveRelearnerMenuSate.listRow + sMoveRelearnerMenuSate.listOffset].id;`
	`827`	`+ return sMoveRelearnerStruct->menuItems[sMoveRelearnerMenuState.listRow + sMoveRelearnerMenuState.listOffset].id;`
`828`	`828`	`}`
`829`	`829`
`830`	`830`	`// Theory: This used to make the heart sprites visible again (i.e.`
`@@ -876,7 +876,7 @@ static void AddScrollArrows(void)`
`876`	`876`	`{`
`877`	`877`	`gTempScrollArrowTemplate = sMoveListScrollArrowsTemplate;`
`878`	`878`	`gTempScrollArrowTemplate.fullyDownThreshold = sMoveRelearnerStruct->numMenuChoices - sMoveRelearnerStruct->numToShowAtOnce;`
`879`		`- sMoveRelearnerStruct->moveListScrollArrowTask = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sMoveRelearnerMenuSate.listOffset);`
	`879`	`+ sMoveRelearnerStruct->moveListScrollArrowTask = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sMoveRelearnerMenuState.listOffset);`
`880`	`880`	`}`
`881`	`881`	`}`
`882`	`882`
`@@ -921,7 +921,7 @@ void MoveRelearnerShowHideHearts(s32 move)`
`921`	`921`	`u16 numHearts;`
`922`	`922`	`u16 i;`
`923`	`923`
`924`		`- if (!sMoveRelearnerMenuSate.showContestInfo \|\| move == LIST_CANCEL)`
	`924`	`+ if (!sMoveRelearnerMenuState.showContestInfo \|\| move == LIST_CANCEL)`
`925`	`925`	`{`
`926`	`926`	`for (i = 0; i < 16; i++)`
`927`	`927`	`gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE;`
Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,7 @@ void NewGameInitData(void)`
`204`	`204`	`WipeTrainerNameRecords();`
`205`	`205`	`ResetTrainerHillResults();`
`206`	`206`	`ResetContestLinkResults();`
	`207`	`+ gSaveBlock2Ptr->expShare = 0;`
`207`	`208`	`}`
`208`	`209`
`209`	`210`	`static void ResetMiniGamesRecords(void)`