Document Battle Pyramid Bag

This commit is contained in:
GriffinR
2021-04-22 18:49:54 -04:00
parent f823cd224f
commit 8c820878bf
13 changed files with 595 additions and 521 deletions
+9 -9
View File
@@ -109,8 +109,8 @@ static void SetUpItemUseCallback(u8 taskId)
}
else
{
gPyramidBagResources->callback2 = sItemUseCallbacks[type];
CloseBattlePyramidBagAndSetCallback(taskId);
gPyramidBagMenu->exitCallback = sItemUseCallbacks[type];
CloseBattlePyramidBag(taskId);
}
}
@@ -822,8 +822,8 @@ static void RemoveUsedItem(void)
}
else
{
sub_81C5924();
sub_81C59BC();
UpdatePyramidBagList();
UpdatePyramidBagCursorPos();
}
}
@@ -943,7 +943,7 @@ void ItemUseInBattle_PokeBall(u8 taskId)
if (!InBattlePyramid())
Task_FadeAndCloseBagMenu(taskId);
else
CloseBattlePyramidBagAndSetCallback(taskId);
CloseBattlePyramidBag(taskId);
}
else if (!InBattlePyramid())
{
@@ -960,7 +960,7 @@ static void Task_CloseStatIncreaseMessage(u8 taskId)
if (!InBattlePyramid())
Task_FadeAndCloseBagMenu(taskId);
else
CloseBattlePyramidBagAndSetCallback(taskId);
CloseBattlePyramidBag(taskId);
}
}
@@ -1005,8 +1005,8 @@ static void ItemUseInBattle_ShowPartyMenu(u8 taskId)
}
else
{
gPyramidBagResources->callback2 = ChooseMonForInBattleItem;
CloseBattlePyramidBagAndSetCallback(taskId);
gPyramidBagMenu->exitCallback = ChooseMonForInBattleItem;
CloseBattlePyramidBag(taskId);
}
}
@@ -1039,7 +1039,7 @@ void ItemUseInBattle_Escape(u8 taskId)
if (!InBattlePyramid())
DisplayItemMessage(taskId, 1, gStringVar4, Task_FadeAndCloseBagMenu);
else
DisplayItemMessageInBattlePyramid(taskId, gStringVar4, CloseBattlePyramidBagAndSetCallback);
DisplayItemMessageInBattlePyramid(taskId, gStringVar4, CloseBattlePyramidBag);
}
else
{