diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-25 09:15:34 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-25 09:15:34 -0500 |
| commit | 10aa908f56599c155ecf70ccee6b07eea07fb643 (patch) | |
| tree | 0bec37a7083498f43dcf1124ceb0ce13c74ca420 /include/battle.h | |
| parent | 0e3d574276db954994b0be24c61813b0b0e28c0c (diff) | |
| parent | 46773995020da0bc7984933f7f407ff30394596d (diff) | |
Merge branch 'dism_more_data' of github.com:PikalaxALT/pokefirered into dism_more_data
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; |