From a75527df250d7ea5fa35630eab711bf4eeef9a02 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 1 Nov 2020 12:36:53 -0500 Subject: Make some labels more consistent --- engine/link/link.asm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'engine/link') diff --git a/engine/link/link.asm b/engine/link/link.asm index 2d8d458b..d8526687 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1148,7 +1148,7 @@ LinkTradeOTPartymonMenuLoop: .not_d_up bit D_DOWN_F, a jp z, LinkTradePartiesMenuMasterLoop - jp LinkTradeCheckCancel + jp LinkTradeOTPartymonMenuCheckCancel LinkTrade_PlayerPartyMenu: xor a @@ -1376,11 +1376,12 @@ LinkTrade_TradeStatsMenu: text_far _LinkAbnormalMonText text_end -LinkTradeCheckCancel: +LinkTradeOTPartymonMenuCheckCancel: ld a, [wMenuCursorY] cp 1 jp nz, LinkTradePartiesMenuMasterLoop call HideCursor + .loop1 ld a, "▶" ldcoord_a 1, 16 @@ -1408,6 +1409,8 @@ LinkTradeCheckCancel: ld a, [wOtherPlayerLinkMode] cp $f jr nz, .loop1 + ; fallthrough + ExitLinkCommunications: xor a ld [wUnusedLinkCommunicationByte], a -- cgit v1.2.3