diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
commit | ab3b8cd51a88f02dbdb72c276a1c35591e8331f4 (patch) | |
tree | 29d5e0c8c1aa2ddd211b65c0160af98044d76678 /include/battle.h | |
parent | 6543d7f2d6e7e12e159588f494895ba02b7d5090 (diff) | |
parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) |
Merge branch 'master' into heal_location
Diffstat (limited to 'include/battle.h')
-rw-r--r-- | include/battle.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h index 1916f450a..ace2bb4ad 100644 --- a/include/battle.h +++ b/include/battle.h @@ -1015,5 +1015,6 @@ extern u8 gBattleOutcome; extern u16 gLastUsedItem; extern u32 gBattleTypeFlags; extern struct MonSpritesGfx* gMonSpritesGfxPtr; +extern u16 gTrainerBattleOpponent_A; #endif // GUARD_BATTLE_H |