From 2db54ecb9b2ec41dd40318395f69814af64f6f7b Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 5 Nov 2020 13:23:57 -0500 Subject: Sync more with pokeyellow --- engine/link/print_waiting_text.asm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'engine/link') 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 -- cgit v1.2.3 From 66377fca32c63ca9e362d2d2ce15f0692260ce53 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 14 Nov 2020 20:52:10 -0600 Subject: Fix file modes --- engine/link/cable_club.asm | 0 engine/link/cable_club_npc.asm | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 engine/link/cable_club.asm mode change 100755 => 100644 engine/link/cable_club_npc.asm (limited to 'engine/link') diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm old mode 100755 new mode 100644 diff --git a/engine/link/cable_club_npc.asm b/engine/link/cable_club_npc.asm old mode 100755 new mode 100644 -- cgit v1.2.3