Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Show Species That You're Switching For in the Party Menu (markdown)

voloved 2023-01-19 07:50:34 -05:00
parent adc2d19a66
commit 4a1291f7fc
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Show-Species-That-You're-Switching-For-in-the-Party-Menu.md

@ -49,3 +49,17 @@ index 64e10598f..f2373d500 100644
const u8 gText_UseOnWhichPokemon[] = _("Use on which POKéMON?"); const u8 gText_UseOnWhichPokemon[] = _("Use on which POKéMON?");
const u8 gText_GiveToWhichPokemon[] = _("Give to 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
```