From 82fa74e7a24b95ba6642bc3cbef3830f32c460a7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 19 Sep 2017 15:51:04 -0700 Subject: Decompile SwapPokemon --- src/battle_party_menu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/battle_party_menu.c') 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; } -- cgit v1.2.3