diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-26 23:33:31 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-26 23:33:31 -0600 |
| commit | 5d74d11d3e3047b4b53153365325db9e6999c627 (patch) | |
| tree | f15fe9425296d4f95d0cd7190d6f19f852fbfe93 /src/battle/battle_party_menu.c | |
| parent | 48ec0941b4ebbe78fe70ef93d205ce52d2de89b2 (diff) | |
| parent | e6500d12a21e9833e08ad25cc6a76b075cff42dd (diff) | |
fix merge conflicts
Diffstat (limited to 'src/battle/battle_party_menu.c')
| -rw-r--r-- | src/battle/battle_party_menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index 237686099..5decf8a7b 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -625,7 +625,7 @@ static void Task_ShowSummaryScreen(u8 taskId) { DestroyTask(taskId); EWRAM_1B000.unk262 = 1; - ShowPokemonSummaryScreen(gPlayerParty, partySelection, gPlayerPartyCount - 1, Task_809535C, 4); + ShowPokemonSummaryScreen(gPlayerParty, partySelection, gPlayerPartyCount - 1, Task_809535C, PSS_MODE_NO_MOVE_ORDER_EDIT); } } |