diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /include/battle.h | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index 00f7dcea9..54aef5106 100644 --- a/include/battle.h +++ b/include/battle.h @@ -24,8 +24,7 @@ #define TRAINER_OPPONENT_3FE 0x3FE #define TRAINER_OPPONENT_C00 0xC00 -#define TRAINER_OPPONENT_800 0x800 -#define STEVEN_PARTNER_ID 0xC03 +#define TRAINER_LINK_OPPONENT 0x800 #define SECRET_BASE_OPPONENT 0x400 #define B_ACTION_USE_MOVE 0 @@ -712,7 +711,7 @@ extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT]; extern u8 gBattleTerrain; -extern struct UnknownPokemonStruct4 gUnknown_2022B58[3]; +extern struct UnknownPokemonStruct4 gMultiPartnerParty[3]; extern u16 *gUnknown_2022BC0; extern u16 gRandomTurnNumber; |