diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-09-21 10:10:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 10:10:04 -0500 |
| commit | b787f8ca045b03521f03d84df8ea06ff87a2ab01 (patch) | |
| tree | 63467bde2f08295e231eec02610f6e041ca38944 /src/pokemon.c | |
| parent | 25e469b6644377ec4e4f82eab294437a61ea7635 (diff) | |
| parent | 66fd9b2ddfef147159033271046f62b4f2c8adad (diff) | |
Merge pull request #335 from DizzyEggg/battledoc
Document some not labeled battle things
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 78a7a55a5..8e2e3b764 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5307,7 +5307,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov // I have to re-use this variable to match. r5 = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitGetMonData(0, 0, 0); + BtlController_EmitGetMonData(0, REQUEST_ALL_BATTLE, 0); MarkBattlerForControllerExec(gActiveBattler); gActiveBattler = r5; } @@ -6621,7 +6621,7 @@ u16 GetBattleBGM(void) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) trainerClass = GetFrontierOpponentClass(gTrainerBattleOpponent_A); - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) trainerClass = TRAINER_CLASS_EXPERT; else trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; |