diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-01 12:36:53 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-01 12:36:53 -0500 |
| commit | a75527df250d7ea5fa35630eab711bf4eeef9a02 (patch) | |
| tree | 00d7b3900efd9cc1af704f9bd9b7c30a4c54dc7d /engine/link | |
| parent | eecff60284d3b4af14902f347d12639ee9849c03 (diff) | |
Make some labels more consistent
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/link.asm | 7 |
1 files changed, 5 insertions, 2 deletions
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 |