diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-10-12 15:39:17 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-10-12 15:39:17 -0500 |
| commit | 8df4982b3ff827ec0e7909484a67dc5923fac53d (patch) | |
| tree | e9b98e2ce622ab500e13b784cab807e4b5b3e615 /src/overworld.c | |
| parent | 3514f9dd6b48f1a0c42a4ea6cb1ab5317fa88c50 (diff) | |
| parent | 4e2be7ff5e4e4f6b7f664bfee4f1d4433c7f238f (diff) | |
Merge remote-tracking branch 'upstream/master' into document-trade
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/overworld.c b/src/overworld.c index e32024c77..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[]; @@ -2742,7 +2742,7 @@ static bool32 PlayerIsAtSouthExit(struct TradeRoomPlayer *player) return FALSE; else if (!MetatileBehavior_IsSouthArrowWarp(player->field_C)) return FALSE; - else if (player->facing != 1) + else if (player->facing != DIR_SOUTH) return FALSE; else return TRUE; @@ -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); |