diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 23:50:03 -0500 |
| commit | d3f13528754b985e892385dbd88c3c9a95681f1b (patch) | |
| tree | 4a18885606996ff59bb714afb5db9a548e2f94a7 /engine/link | |
| parent | abaf9fee7c73e708ef8c3e7a1ed710bfc9ec6f6e (diff) | |
| parent | e16dec874a239c162680b169391d3c0c7ee1fc70 (diff) | |
Merge pull request #301 from Rangi42/master
Sync home and macro code with pokeyellow
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/print_waiting_text.asm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engine/link/print_waiting_text.asm b/engine/link/print_waiting_text.asm index d74d635f..1a16e2f2 100644 --- a/engine/link/print_waiting_text.asm +++ b/engine/link/print_waiting_text.asm @@ -1,15 +1,16 @@ PrintWaitingText:: hlcoord 3, 10 - ld b, $1 - ld c, $b + ld b, 1 + ld c, 11 ld a, [wIsInBattle] and a - jr z, .asm_4c17 + jr z, .trade +; battle call TextBoxBorder - jr .asm_4c1a -.asm_4c17 + jr .border_done +.trade call CableClub_TextBoxBorder -.asm_4c1a +.border_done hlcoord 4, 11 ld de, WaitingText call PlaceString |