diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_party_menu.c | 5 | ||||
| -rw-r--r-- | src/party_menu.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index ca883daec..9db9b0dab 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -40,7 +40,6 @@ extern void sub_806AF4C(); extern void sub_806AEDC(void); extern u8 *sub_8040D08(); extern void sub_8040B8C(void); -extern void sub_806E6F0(); extern void nullsub_14(); extern void OpenPartyMenu(); extern u8 sub_803FBBC(void); @@ -338,7 +337,7 @@ void unref_sub_8094DB0(void) { r4 = sub_8094C20(0); sub_8094C98(0, i); - sub_806E6F0(&gPlayerParty[r4], &gPlayerParty[n]); + SwapPokemon(&gPlayerParty[r4], &gPlayerParty[n]); break; } } @@ -732,7 +731,7 @@ static void Task_BattlePartyMenuShift(u8 taskId) gUnknown_0202E8F4 = 1; r4 = pokemon_order_func(gBattlePartyID[gBankInMenu]); sub_8094C98(r4, partySelection); - sub_806E6F0(&gPlayerParty[r4], &gPlayerParty[partySelection]); + SwapPokemon(&gPlayerParty[r4], &gPlayerParty[partySelection]); gTasks[taskId].func = Task_809527C; } diff --git a/src/party_menu.c b/src/party_menu.c index e98af59ee..553ff0ad0 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -112,6 +112,13 @@ void sub_806AEDC(void) #endif +void SwapPokemon(struct Pokemon *a, struct Pokemon *b) +{ + struct Pokemon temp = *a; + *a = *b; + *b = temp; +} + void SetPartyPopupMenuOffsets(u8 menuIndex, u8 *left, u8 *top, const struct PartyPopupMenu *menu) { u8 bottomOffset = (2 * menu[menuIndex].numChoices) + 2; |