From 4a1291f7fcad827c1dfadde3dc4bd98751e6fd49 Mon Sep 17 00:00:00 2001 From: voloved <36523934+voloved@users.noreply.github.com> Date: Thu, 19 Jan 2023 07:50:34 -0500 Subject: [PATCH] Updated Show Species That You're Switching For in the Party Menu (markdown) --- ...-That-You're-Switching-For-in-the-Party-Menu.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Show-Species-That-You're-Switching-For-in-the-Party-Menu.md b/Show-Species-That-You're-Switching-For-in-the-Party-Menu.md index cc14883..c50a3d2 100644 --- a/Show-Species-That-You're-Switching-For-in-the-Party-Menu.md +++ b/Show-Species-That-You're-Switching-For-in-the-Party-Menu.md @@ -48,4 +48,18 @@ index 64e10598f..f2373d500 100644 const u8 gText_TeachWhichPokemon[] = _("Teach which POKéMON?"); const u8 gText_UseOnWhichPokemon[] = _("Use on which POKéMON?"); const u8 gText_GiveToWhichPokemon[] = _("Give to which POKéMON?"); +``` +```diff +------------------------------ src/battle_main.c ------------------------------ +index 4d534b447..707c211fd 100644 +@@ -5212,8 +5212,10 @@ static void HandleEndTurn_MonFled(void) + + static void HandleEndTurn_FinishBattle(void) + { ++ gBattleMons[B_SIDE_OPPONENT].species = SPECIES_NONE; // So the "Choose a Pkmn message doesn't include the last mon battled outside of battle." ++ *(gBattleStruct->monToSwitchIntoId + B_SIDE_OPPONENT) = SPECIES_NONE; // Should already be none at the end of a battle, but better to be explicit + if (gCurrentActionFuncId == B_ACTION_TRY_FINISH || gCurrentActionFuncId == B_ACTION_FINISHED) + { + if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK + | BATTLE_TYPE_RECORDED_LINK ``` \ No newline at end of file