diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:26:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-13 15:26:44 -0400 |
| commit | a081124a20896a0cc2ee4fac2df6d4b5440125ef (patch) | |
| tree | d839bae53453aadf4b7bf14a72d1669eaf6fee43 /src/overworld.c | |
| parent | 2368f57669f6d2e9dc81f4028ff95c9421bd31a8 (diff) | |
| parent | e47b3efdfe8a397e20905d566a8e1b1261170fbb (diff) | |
Merge branch 'master' into doc-inc
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/overworld.c b/src/overworld.c index 8a8544259..d796a670f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -85,9 +85,9 @@ extern const u8 EventScript_WhiteOut[]; extern const u8 EventScript_ResetMrBriney[]; extern const u8 EventScript_DoLinkRoomExit[]; -extern const u8 gEventScript_TradeRoom_TooBusyToNotice[]; -extern const u8 gEventScript_TradeRoom_ReadTrainerCard_NoColor[]; -extern const u8 gEventScript_TradeRoom_ReadTrainerCard_Normal[]; +extern const u8 CableClub_EventScript_TooBusyToNotice[]; +extern const u8 CableClub_EventScript_ReadTrainerCard[]; +extern const u8 CableClub_EventScript_ReadTrainerCardColored[]; extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot0[]; extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot1[]; extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot2[]; @@ -2765,13 +2765,13 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) if (linkPlayerId != 4) { if (!player->isLocalPlayer) - return gEventScript_TradeRoom_TooBusyToNotice; + return CableClub_EventScript_TooBusyToNotice; else if (sPlayerTradingStates[linkPlayerId] != PLAYER_TRADING_STATE_IDLE) - return gEventScript_TradeRoom_TooBusyToNotice; + return CableClub_EventScript_TooBusyToNotice; else if (!GetLinkTrainerCardColor(linkPlayerId)) - return gEventScript_TradeRoom_ReadTrainerCard_NoColor; + return CableClub_EventScript_ReadTrainerCard; else - return gEventScript_TradeRoom_ReadTrainerCard_Normal; + return CableClub_EventScript_ReadTrainerCardColored; } return GetInteractedLinkPlayerScript(&otherPlayerPos, player->field_C, player->facing); |