Applied review changes
This commit is contained in:
+1
-1
@@ -90,7 +90,7 @@ static void Task_TryFieldPoisonWhiteOut(u8 taskId)
|
|||||||
{
|
{
|
||||||
// Battle facilities have their own white out script to handle the challenge loss
|
// Battle facilities have their own white out script to handle the challenge loss
|
||||||
#ifdef BUGFIX
|
#ifdef BUGFIX
|
||||||
if (CurrentBattlePyramidLocation() != PYRAMID_LOCATION_NONE || InBattlePike() || InTrainerHillChallenge())
|
if (CurrentBattlePyramidLocation() || InBattlePike() || InTrainerHillChallenge())
|
||||||
#else
|
#else
|
||||||
if (CurrentBattlePyramidLocation() | InBattlePike() || InTrainerHillChallenge())
|
if (CurrentBattlePyramidLocation() | InBattlePike() || InTrainerHillChallenge())
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+1
-1
@@ -983,7 +983,7 @@ static void Task_UseStatIncreaseItem(u8 taskId)
|
|||||||
{
|
{
|
||||||
PlaySE(SE_USE_ITEM);
|
PlaySE(SE_USE_ITEM);
|
||||||
RemoveBagItem(gSpecialVar_ItemId, 1);
|
RemoveBagItem(gSpecialVar_ItemId, 1);
|
||||||
if (CurrentBattlePyramidLocation() == PYRAMID_LOCATION_NONE) // CurrentBattlePyramidLocation() == PYRAMID_LOCATION_NONE doesn't match
|
if (CurrentBattlePyramidLocation() == PYRAMID_LOCATION_NONE)
|
||||||
DisplayItemMessage(taskId, FONT_NORMAL, UseStatIncreaseItem(gSpecialVar_ItemId), Task_CloseStatIncreaseMessage);
|
DisplayItemMessage(taskId, FONT_NORMAL, UseStatIncreaseItem(gSpecialVar_ItemId), Task_CloseStatIncreaseMessage);
|
||||||
else
|
else
|
||||||
DisplayItemMessageInBattlePyramid(taskId, UseStatIncreaseItem(gSpecialVar_ItemId), Task_CloseStatIncreaseMessage);
|
DisplayItemMessageInBattlePyramid(taskId, UseStatIncreaseItem(gSpecialVar_ItemId), Task_CloseStatIncreaseMessage);
|
||||||
|
|||||||
Reference in New Issue
Block a user