dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed typo in sMoveRelearnerMenuState (#2155)

Browse Source
This commit is contained in:
psf
2025-06-17 07:38:33 -07:00
committed by GitHub
parent bfa3e4a07b
commit 75fe3e7da6
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/move_relearner.c
+24 -24
View File
@@ -179,7 +179,7 @@ static EWRAM_DATA struct {
u16 listOffset; u16 listOffset;
u16 listRow; u16 listRow;
bool8 showContestInfo; bool8 showContestInfo;
} sMoveRelearnerMenuSate = {0}; } sMoveRelearnerMenuState = {0};
static const u16 sUI_Pal[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal"); static const u16 sUI_Pal[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal");
@@ -401,9 +401,9 @@ static void CB2_InitLearnMove(void)
InitMoveRelearnerBackgroundLayers(); InitMoveRelearnerBackgroundLayers();
InitMoveRelearnerWindows(FALSE); InitMoveRelearnerWindows(FALSE);
sMoveRelearnerMenuSate.listOffset = 0; sMoveRelearnerMenuState.listOffset = 0;
sMoveRelearnerMenuSate.listRow = 0; sMoveRelearnerMenuState.listRow = 0;
sMoveRelearnerMenuSate.showContestInfo = FALSE; sMoveRelearnerMenuState.showContestInfo = FALSE;
CreateLearnableMovesList(); CreateLearnableMovesList();
@@ -411,7 +411,7 @@ static void CB2_InitLearnMove(void)
LoadSpritePalette(&sMoveRelearnerPalette); LoadSpritePalette(&sMoveRelearnerPalette);
CreateUISprites(); CreateUISprites();
sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow); sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuState.listOffset, sMoveRelearnerMenuState.listRow);
SetBackdropFromColor(RGB_BLACK); SetBackdropFromColor(RGB_BLACK);
SetMainCallback2(CB2_MoveRelearnerMain); SetMainCallback2(CB2_MoveRelearnerMain);
} }
@@ -429,14 +429,14 @@ static void CB2_InitLearnMoveReturnFromSelectMove(void)
SetVBlankCallback(VBlankCB_MoveRelearner); SetVBlankCallback(VBlankCB_MoveRelearner);
InitMoveRelearnerBackgroundLayers(); InitMoveRelearnerBackgroundLayers();
InitMoveRelearnerWindows(sMoveRelearnerMenuSate.showContestInfo); InitMoveRelearnerWindows(sMoveRelearnerMenuState.showContestInfo);
CreateLearnableMovesList(); CreateLearnableMovesList();
LoadSpriteSheet(&sMoveRelearnerSpriteSheet); LoadSpriteSheet(&sMoveRelearnerSpriteSheet);
LoadSpritePalette(&sMoveRelearnerPalette); LoadSpritePalette(&sMoveRelearnerPalette);
CreateUISprites(); CreateUISprites();
sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow); sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuState.listOffset, sMoveRelearnerMenuState.listRow);
SetBackdropFromColor(RGB_BLACK); SetBackdropFromColor(RGB_BLACK);
SetMainCallback2(CB2_MoveRelearnerMain); SetMainCallback2(CB2_MoveRelearnerMain);
} }
@@ -533,11 +533,11 @@ static void DoMoveRelearnerMain(void)
} }
else if (selection == MENU_B_PRESSED || selection == 1) else if (selection == MENU_B_PRESSED || selection == 1)
{ {
if (sMoveRelearnerMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuState.showContestInfo == FALSE)
{ {
sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
} }
else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
{ {
sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
} }
@@ -562,11 +562,11 @@ static void DoMoveRelearnerMain(void)
} }
else if (selection == MENU_B_PRESSED || selection == 1) else if (selection == MENU_B_PRESSED || selection == 1)
{ {
if (sMoveRelearnerMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuState.showContestInfo == FALSE)
{ {
sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
} }
else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
{ {
sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
} }
@@ -622,11 +622,11 @@ static void DoMoveRelearnerMain(void)
else if (selection == MENU_B_PRESSED || selection == 1) else if (selection == MENU_B_PRESSED || selection == 1)
{ {
// What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway. // 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; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
} }
else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
{ {
sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
} }
@@ -638,11 +638,11 @@ static void DoMoveRelearnerMain(void)
if (!MoveRelearnerRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
FillWindowPixelBuffer(RELEARNERWIN_MSG, 0x11); FillWindowPixelBuffer(RELEARNERWIN_MSG, 0x11);
if (sMoveRelearnerMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuState.showContestInfo == FALSE)
{ {
sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
} }
else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
{ {
sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
} }
@@ -685,11 +685,11 @@ static void DoMoveRelearnerMain(void)
case MENU_STATE_FADE_FROM_SUMMARY_SCREEN: case MENU_STATE_FADE_FROM_SUMMARY_SCREEN:
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
sMoveRelearnerStruct->state++; sMoveRelearnerStruct->state++;
if (sMoveRelearnerMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuState.showContestInfo == FALSE)
{ {
HideHeartSpritesAndShowTeachMoveText(TRUE); HideHeartSpritesAndShowTeachMoveText(TRUE);
} }
else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuState.showContestInfo == TRUE)
{ {
ShowTeachMoveText(TRUE); ShowTeachMoveText(TRUE);
} }
@@ -751,7 +751,7 @@ static void DoMoveRelearnerMain(void)
static void FreeMoveRelearnerResources(void) static void FreeMoveRelearnerResources(void)
{ {
RemoveScrollArrows(); RemoveScrollArrows();
DestroyListMenuTask(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow); DestroyListMenuTask(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuState.listOffset, &sMoveRelearnerMenuState.listRow);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
FREE_AND_SET_NULL(sMoveRelearnerStruct); FREE_AND_SET_NULL(sMoveRelearnerStruct);
ResetSpriteData(); ResetSpriteData();
@@ -778,7 +778,7 @@ static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites)
static void HandleInput(bool8 showContest) static void HandleInput(bool8 showContest)
{ {
s32 itemId = ListMenu_ProcessInput(sMoveRelearnerStruct->moveListMenuTask); s32 itemId = ListMenu_ProcessInput(sMoveRelearnerStruct->moveListMenuTask);
ListMenuGetScrollAndRow(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow); ListMenuGetScrollAndRow(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuState.listOffset, &sMoveRelearnerMenuState.listRow);
switch (itemId) switch (itemId)
{ {
@@ -792,13 +792,13 @@ static void HandleInput(bool8 showContest)
{ {
PutWindowTilemap(RELEARNERWIN_DESC_CONTEST); PutWindowTilemap(RELEARNERWIN_DESC_CONTEST);
sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
sMoveRelearnerMenuSate.showContestInfo = TRUE; sMoveRelearnerMenuState.showContestInfo = TRUE;
} }
else else
{ {
PutWindowTilemap(RELEARNERWIN_DESC_BATTLE); PutWindowTilemap(RELEARNERWIN_DESC_BATTLE);
sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
sMoveRelearnerMenuSate.showContestInfo = FALSE; sMoveRelearnerMenuState.showContestInfo = FALSE;
} }
ScheduleBgCopyTilemapToVram(1); ScheduleBgCopyTilemapToVram(1);
@@ -824,7 +824,7 @@ static void HandleInput(bool8 showContest)
static s32 GetCurrentSelectedMove(void) 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. // Theory: This used to make the heart sprites visible again (i.e.
@@ -876,7 +876,7 @@ static void AddScrollArrows(void)
{ {
gTempScrollArrowTemplate = sMoveListScrollArrowsTemplate; gTempScrollArrowTemplate = sMoveListScrollArrowsTemplate;
gTempScrollArrowTemplate.fullyDownThreshold = sMoveRelearnerStruct->numMenuChoices - sMoveRelearnerStruct->numToShowAtOnce; 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 numHearts;
u16 i; u16 i;
if (!sMoveRelearnerMenuSate.showContestInfo || move == LIST_CANCEL) if (!sMoveRelearnerMenuState.showContestInfo || move == LIST_CANCEL)
{ {
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE; gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE;