Stick to the new name
This commit is contained in:
+5
-5
@@ -293,7 +293,7 @@ static void BuildStartMenuActions(void)
|
||||
{
|
||||
BuildBattlePikeStartMenu();
|
||||
}
|
||||
else if (InBattlePyramid())
|
||||
else if (CurrentBattlePyramidLocation() != PYRAMID_LOCATION_NONE)
|
||||
{
|
||||
BuildBattlePyramidStartMenu();
|
||||
}
|
||||
@@ -439,7 +439,7 @@ static void RemoveExtraStartMenuWindows(void)
|
||||
CopyWindowToVram(sSafariBallsWindowId, COPYWIN_GFX);
|
||||
RemoveWindow(sSafariBallsWindowId);
|
||||
}
|
||||
if (InBattlePyramid())
|
||||
if (CurrentBattlePyramidLocation() != PYRAMID_LOCATION_NONE)
|
||||
{
|
||||
ClearStdWindowAndFrameToTransparent(sBattlePyramidFloorWindowId, FALSE);
|
||||
RemoveWindow(sBattlePyramidFloorWindowId);
|
||||
@@ -499,7 +499,7 @@ static bool32 InitStartMenuStep(void)
|
||||
case 3:
|
||||
if (GetSafariZoneFlag())
|
||||
ShowSafariBallsWindow();
|
||||
if (InBattlePyramid())
|
||||
if (CurrentBattlePyramidLocation() != PYRAMID_LOCATION_NONE)
|
||||
ShowPyramidFloorWindow();
|
||||
sInitStartMenuData[0]++;
|
||||
break;
|
||||
@@ -720,7 +720,7 @@ static bool8 StartMenuPlayerNameCallback(void)
|
||||
|
||||
static bool8 StartMenuSaveCallback(void)
|
||||
{
|
||||
if (InBattlePyramid())
|
||||
if (CurrentBattlePyramidLocation() != PYRAMID_LOCATION_NONE)
|
||||
RemoveExtraStartMenuWindows();
|
||||
|
||||
gMenuCallback = SaveStartCallback; // Display save menu
|
||||
@@ -981,7 +981,7 @@ static u8 SaveConfirmSaveCallback(void)
|
||||
RemoveStartMenuWindow();
|
||||
ShowSaveInfoWindow();
|
||||
|
||||
if (InBattlePyramid())
|
||||
if (CurrentBattlePyramidLocation() != PYRAMID_LOCATION_NONE)
|
||||
{
|
||||
ShowSaveMessage(gText_BattlePyramidConfirmRest, SaveYesNoCallback);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user