aboutsummaryrefslogtreecommitdiffstats
path: root/engine/link
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-11-05 23:50:02 -0500
committerGitHub <noreply@github.com>2020-11-05 23:50:02 -0500
commit5db3bdd6551fad07066b669db1e44a6151aaa0b4 (patch)
treeab357b894c9457b3d1d38fd49300df34412168f8 /engine/link
parentMerge pull request #59 from Rangi42/master (diff)
parentSync more with pokered (diff)
downloadpokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.gz
pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.xz
pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.zip
Merge pull request #60 from Rangi42/master
Organize home and macro code
Diffstat (limited to 'engine/link')
-rw-r--r--engine/link/print_waiting_text.asm9
1 files changed, 5 insertions, 4 deletions
diff --git a/engine/link/print_waiting_text.asm b/engine/link/print_waiting_text.asm
index 98a44970..a07967fd 100644
--- a/engine/link/print_waiting_text.asm
+++ b/engine/link/print_waiting_text.asm
@@ -3,12 +3,13 @@ PrintWaitingText::
lb bc, 1, 11
ld a, [wIsInBattle]
and a
- jr z, .asm_4b9a
+ jr z, .trade
+; battle
call TextBoxBorder
- jr .asm_4b9d
-.asm_4b9a
+ jr .border_done
+.trade
call CableClub_TextBoxBorder
-.asm_4b9d
+.border_done
hlcoord 4, 11
ld de, WaitingText
call PlaceString