diff options
| author | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
| commit | 2c14d6ee6c40f4b7e5cd9366080ce911d67be718 (patch) | |
| tree | 4a70ca275a2f161d2d23f63d0608f92d8ea08acb /src/battle_controller_link_opponent.c | |
| parent | d6a88e0eaa7d74f187fb27f8a376203f40537340 (diff) | |
| parent | d9a5de5317d4589b139f9532a7e8bf3b851e673f (diff) | |
fix merge conflicts
Diffstat (limited to 'src/battle_controller_link_opponent.c')
| -rw-r--r-- | src/battle_controller_link_opponent.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 0cec046e4..8cbc62aab 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -27,7 +27,6 @@ #include "constants/trainers.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; @@ -1251,17 +1250,17 @@ static void LinkOpponentHandleDrawTrainerPic(void) || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN) { if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED]; } else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE) { if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN]; } else { @@ -1280,17 +1279,17 @@ static void LinkOpponentHandleDrawTrainerPic(void) || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN) { if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED]; } else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE) { if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN]; } else { |