From 80480821142d7a7b16dd2b1a98a213e7b389af0f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 14:30:10 -0500 Subject: Remove Predef_ prefix from routines listed in PredefPointers --- engine/link_trade.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'engine/link_trade.asm') diff --git a/engine/link_trade.asm b/engine/link_trade.asm index f85403a29..ae84a7beb 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -48,7 +48,7 @@ _LinkTextbox: ; 16d61d ld l, e push bc push hl - call .draw_border + call .PlaceBorder pop hl pop bc @@ -58,7 +58,7 @@ _LinkTextbox: ; 16d61d inc b inc c inc c - ld a, $7 + ld a, PAL_BG_TEXT .row push bc push hl @@ -75,12 +75,12 @@ _LinkTextbox: ; 16d61d ret ; 16d640 -.draw_border ; 16d640 +.PlaceBorder ; 16d640 push hl ld a, $30 ld [hli], a inc a - call .fill_row + call .PlaceRow inc a ld [hl], a pop hl @@ -91,7 +91,7 @@ _LinkTextbox: ; 16d61d ld a, $33 ld [hli], a ld a, " " - call .fill_row + call .PlaceRow ld [hl], $34 pop hl ld de, SCREEN_WIDTH @@ -102,17 +102,17 @@ _LinkTextbox: ; 16d61d ld a, $35 ld [hli], a ld a, $36 - call .fill_row + call .PlaceRow ld [hl], $37 ret ; 16d66d -.fill_row ; 16d66d +.PlaceRow ; 16d66d ld d, c -.loop4 +.row_loop ld [hli], a dec d - jr nz, .loop4 + jr nz, .row_loop ret ; 16d673 @@ -181,7 +181,7 @@ Function16d6e1: ; 16d6e1 hlcoord 4, 10 ld b, 1 ld c, 10 - predef Predef_LinkTextbox + predef LinkTextboxAtHL hlcoord 5, 11 ld de, .Waiting call PlaceString -- cgit v1.2.3 From 0c6338836d714f464bfcaa0c8c5b8c76e6f4958d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 14:49:43 -0500 Subject: Resolve #471 (although link code still needs more cleanup, like its WRAM labels) --- engine/link_trade.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/link_trade.asm') diff --git a/engine/link_trade.asm b/engine/link_trade.asm index ae84a7beb..9a7a2e3d7 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -139,7 +139,7 @@ _LoadTradeScreenBorder: ; 16d696 LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a ld de, LinkCommsBorderGFX + $30 tiles - ld hl, vTiles2 tile $76 + ld hl, vTiles2 tile "ぁ" lb bc, BANK(LinkCommsBorderGFX), 8 call Get2bpp ret -- cgit v1.2.3 From ddec0ee305f25bc9941e19e16c79f499c5e95c23 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 20:48:33 -0500 Subject: More Japanese characters --- engine/link_trade.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/link_trade.asm') diff --git a/engine/link_trade.asm b/engine/link_trade.asm index 9a7a2e3d7..ae84a7beb 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -139,7 +139,7 @@ _LoadTradeScreenBorder: ; 16d696 LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a ld de, LinkCommsBorderGFX + $30 tiles - ld hl, vTiles2 tile "ぁ" + ld hl, vTiles2 tile $76 lb bc, BANK(LinkCommsBorderGFX), 8 call Get2bpp ret -- cgit v1.2.3 From 05382d3e3c03616d6edf21833e89a8264a8cd10a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 20 Jan 2018 12:25:55 -0500 Subject: PARTY_LENGTH; MON_NAME; sgb_border.bin --- engine/link_trade.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/link_trade.asm') diff --git a/engine/link_trade.asm b/engine/link_trade.asm index ae84a7beb..504dc6d95 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -283,7 +283,7 @@ LinkTradeMenu: ; 16d70c ld [hl], a push hl push bc - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH add hl, bc ld [hl], a pop bc @@ -335,7 +335,7 @@ LinkTradeMenu: ; 16d70c ld [hl], $1f push hl push bc - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH add hl, bc ld [hl], $1f pop bc -- cgit v1.2.3