diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-05-19 13:30:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 13:30:42 -0400 |
| commit | 3c4b9dfaccae3ce4e821721b1b8870b9750f1143 (patch) | |
| tree | 98cb15c8e5f8ceedbdc43ebad6c81ac95a98b2bc /src/party_menu.c | |
| parent | eb4c880db88c5218815f39744f8c0bc9bef8e178 (diff) | |
| parent | bdebab834cdad6b18c7726057ff682dae9ab2a16 (diff) | |
Merge pull request #1044 from DizzyEggg/sss
Document pokemon summary screen
Diffstat (limited to 'src/party_menu.c')
| -rwxr-xr-x | src/party_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index 43bdc46ec..4ed7ab1b2 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2129,7 +2129,7 @@ static void DrawEmptySlot(u8 windowId) LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[0]), paletteOffsets[0] + palNum, 2); \ LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[1]), paletteOffsets[1] + palNum, 2); \ LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[2]), paletteOffsets[2] + palNum, 2); \ -} +} static void LoadPartyBoxPalette(struct PartyMenuBox *menuBox, u8 palFlags) { @@ -2708,7 +2708,7 @@ static void CB2_ShowPokemonSummaryScreen(void) if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE) { UpdatePartyToBattleOrder(); - ShowPokemonSummaryScreen(PSS_MODE_UNK1, gPlayerParty, gPartyMenu.slotId, gPlayerPartyCount - 1, CB2_ReturnToPartyMenuFromSummaryScreen); + ShowPokemonSummaryScreen(PSS_MODE_LOCK_MOVES, gPlayerParty, gPartyMenu.slotId, gPlayerPartyCount - 1, CB2_ReturnToPartyMenuFromSummaryScreen); } else { @@ -2899,7 +2899,7 @@ static void Task_SlideSelectedSlotsOnscreen(u8 taskId) SlidePartyMenuBoxOneStep(taskId); SlidePartyMenuBoxSpritesOneStep(taskId); - + // Both slots have slid back onscreen if (tSlot1SlideDir == 0 && tSlot2SlideDir == 0) { @@ -3096,7 +3096,7 @@ static void Task_HandleSwitchItemsYesNoInput(u8 taskId) { case 0: // Yes, switch items RemoveBagItem(gSpecialVar_ItemId, 1); - + // No room to return held item to bag if (AddBagItem(sPartyMenuItemId, 1) == FALSE) { @@ -5456,7 +5456,7 @@ static void RemoveItemToGiveFromBag(u16 item) // but there always should be, and the return is ignored in all uses static bool8 ReturnGiveItemToBagOrPC(u16 item) { - if (gPartyMenu.action == PARTY_ACTION_GIVE_ITEM) + if (gPartyMenu.action == PARTY_ACTION_GIVE_ITEM) return AddBagItem(item, 1); else return AddPCItem(item, 1); |