dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve change requests

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-11-24 09:28:43 +08:00
parent 7817546781
commit 0ca414959b
6 changed files with 2099 additions and 2117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/party_menu.c
+12 -12
View File
@@ -1159,13 +1159,13 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
}
else
{
switch (gPartyMenu.action - 3)
switch (gPartyMenu.action)
{
case PARTY_ACTION_SOFTBOILED - 3:
case PARTY_ACTION_SOFTBOILED:
if (IsSelectedMonNotEgg((u8 *)slotPtr))
Task_TryUseSoftboiledOnPartyMon(taskId);
break;
case PARTY_ACTION_USE_ITEM - 3:
case PARTY_ACTION_USE_ITEM:
if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE)
@@ -1173,46 +1173,46 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
gItemUseCB(taskId, Task_ClosePartyMenuAfterText);
}
break;
case PARTY_ACTION_MOVE_TUTOR - 3:
case PARTY_ACTION_MOVE_TUTOR:
if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
PlaySE(SE_SELECT);
TryTutorSelectedMon(taskId);
}
break;
case PARTY_ACTION_GIVE_MAILBOX_MAIL - 3:
case PARTY_ACTION_GIVE_MAILBOX_MAIL:
if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
PlaySE(SE_SELECT);
TryGiveMailToSelectedMon(taskId);
}
break;
case PARTY_ACTION_GIVE_ITEM - 3:
case PARTY_ACTION_GIVE_PC_ITEM - 3:
case PARTY_ACTION_GIVE_ITEM:
case PARTY_ACTION_GIVE_PC_ITEM:
if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
PlaySE(SE_SELECT);
TryGiveItemOrMailToSelectedMon(taskId);
}
break;
case PARTY_ACTION_SWITCH - 3:
case PARTY_ACTION_SWITCH:
PlaySE(SE_SELECT);
SwitchSelectedMons(taskId);
break;
case PARTY_ACTION_CHOOSE_AND_CLOSE - 3:
case PARTY_ACTION_CHOOSE_AND_CLOSE:
PlaySE(SE_SELECT);
gSpecialVar_0x8004 = *slotPtr;
if (gPartyMenu.menuType == PARTY_MENU_TYPE_MOVE_RELEARNER)
gSpecialVar_0x8005 = GetNumberOfRelearnableMoves(&gPlayerParty[*slotPtr]);
Task_ClosePartyMenu(taskId);
break;
case PARTY_ACTION_MINIGAME - 3:
case PARTY_ACTION_MINIGAME:
if (IsSelectedMonNotEgg((u8 *)slotPtr))
TryEnterMonForMinigame(taskId, (u8)*slotPtr);
break;
default:
case PARTY_ACTION_ABILITY_PREVENTS - 3:
case PARTY_ACTION_SWITCHING - 3:
case PARTY_ACTION_ABILITY_PREVENTS:
case PARTY_ACTION_SWITCHING:
PlaySE(SE_SELECT);
Task_TryCreateSelectionWindow(taskId);
break;