diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-10 14:13:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-10 14:13:41 -0500 |
| commit | 6645ad8ccf92b74cb00098601a4dafcc8349de62 (patch) | |
| tree | c797b65413a0b5e8e5fb25d8d3d34353b450c568 /src/battle_controller_player.c | |
| parent | 30f74d1c371dbf324a28613554ee9027c4918dd6 (diff) | |
| parent | 7526b2ccf1ab02a975ee477341f8accbf3f108c5 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index baa794f70..7f1f738a3 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1313,7 +1313,7 @@ static void WaitForMonSelection(void) { if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { - if (gPartyMenuUseExitCallback == 1) + if (gPartyMenuUseExitCallback == TRUE) BtlController_EmitChosenMonReturnValue(1, gSelectedMonPartyId, gBattlePartyCurrentOrder); else BtlController_EmitChosenMonReturnValue(1, 6, NULL); |