atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1846 from Jaizu/patch-31

Browse source 
Add constants when using GetMonsStateToDoubles_2
This commit is contained in:
GriffinR 2023-01-15 08:46:11 -05:00 committed by GitHub
commit ba8bed4da3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/trainer_see.c
View file

@ -213,7 +213,7 @@ bool8 CheckForTrainersWantingBattle(void)
if (gNoOfApproachingTrainers > 1) if (gNoOfApproachingTrainers > 1)
break; break;
if (GetMonsStateToDoubles_2() != 0) // one trainer found and cant have a double battle if (GetMonsStateToDoubles_2() != PLAYER_HAS_TWO_USABLE_MONS) // one trainer found and cant have a double battle
break; break;
} }
@ -280,7 +280,7 @@ static u8 CheckTrainer(u8 objectEventId)
|| scriptPtr[1] == TRAINER_BATTLE_REMATCH_DOUBLE || scriptPtr[1] == TRAINER_BATTLE_REMATCH_DOUBLE
|| scriptPtr[1] == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE) || scriptPtr[1] == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE)
{ {
if (GetMonsStateToDoubles_2() != 0) if (GetMonsStateToDoubles_2() != PLAYER_HAS_TWO_USABLE_MONS)
return 0; return 0;
numTrainers = 2; numTrainers = 2;