Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In labels, stick to Place for text without delay, and Print for text with letter delay (#1078)

Browse Source
This commit is contained in:
xCrystal
2024-01-07 14:06:40 +01:00
parent cd28c44ff3
commit 5be9856f3a
20 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/link/link.asm
View File

@@ -549,7 +549,7 @@ LinkTimeout:
pop de
pop hl
bccoord 1, 14
call PlaceHLTextAtBC
call PrintTextboxTextAt
call RotateThreePalettesRight
call ClearScreen
ld b, SCGB_DIPLOMA
@@ -1504,7 +1504,7 @@ LinkTrade_TradeStatsMenu:
dec a
ld [wCurTradePartyMon], a
ld [wPlayerLinkAction], a
farcall PrintWaitingTextAndSyncAndExchangeNybble
farcall PlaceWaitingTextAndSyncAndExchangeNybble
ld a, [wOtherPlayerLinkMode]
cp $f
jp z, InitTradeMenuDisplay
@@ -1526,7 +1526,7 @@ LinkTrade_TradeStatsMenu:
farcall Link_WaitBGMap
ld hl, .LinkTradeCantBattleText
bccoord 1, 14
call PlaceHLTextAtBC
call PrintTextboxTextAt
jr .cancel_trade
.abnormal
@@ -1548,7 +1548,7 @@ LinkTrade_TradeStatsMenu:
farcall Link_WaitBGMap
ld hl, .LinkAbnormalMonText
bccoord 1, 14
call PlaceHLTextAtBC
call PrintTextboxTextAt
.cancel_trade
hlcoord 0, 12
@@ -1560,7 +1560,7 @@ LinkTrade_TradeStatsMenu:
call PlaceString
ld a, $1
ld [wPlayerLinkAction], a
farcall PrintWaitingTextAndSyncAndExchangeNybble
farcall PlaceWaitingTextAndSyncAndExchangeNybble
ld c, 100
call DelayFrames
jp InitTradeMenuDisplay
@@ -1622,7 +1622,7 @@ LinkTradePartymonMenuCheckCancel:
ldcoord_a 9, 17
ld a, $f
ld [wPlayerLinkAction], a
farcall PrintWaitingTextAndSyncAndExchangeNybble
farcall PlaceWaitingTextAndSyncAndExchangeNybble
ld a, [wOtherPlayerLinkMode]
cp $f
jr nz, .loop1
@@ -1721,7 +1721,7 @@ LinkTrade:
call GetPokemonName
ld hl, LinkAskTradeForText
bccoord 1, 14
call PlaceHLTextAtBC
call PrintTextboxTextAt
call LoadStandardMenuHeader
hlcoord 10, 7
ld b, 3
@@ -1770,13 +1770,13 @@ LinkTrade:
hlcoord 1, 14
ld de, String_TooBadTheTradeWasCanceled
call PlaceString
farcall PrintWaitingTextAndSyncAndExchangeNybble
farcall PlaceWaitingTextAndSyncAndExchangeNybble
jp InitTradeMenuDisplay_Delay
.try_trade
ld a, $2
ld [wPlayerLinkAction], a
farcall PrintWaitingTextAndSyncAndExchangeNybble
farcall PlaceWaitingTextAndSyncAndExchangeNybble
ld a, [wOtherPlayerLinkMode]
dec a
jr nz, .do_trade
@@ -2019,7 +2019,7 @@ LinkTrade:
ld a, b
ld [wPlayerLinkAction], a
push bc
call Serial_PrintWaitingTextAndSyncAndExchangeNybble
call Serial_PlaceWaitingTextAndSyncAndExchangeNybble
pop bc
ld a, [wLinkMode]
cp LINK_TIMECAPSULE

6
engine/link/link_trade.asm
View File

@@ -156,15 +156,15 @@ LinkTextbox:
call _LinkTextbox
ret
PrintWaitingTextAndSyncAndExchangeNybble:
PlaceWaitingTextAndSyncAndExchangeNybble:
call LoadStandardMenuHeader
call .PrintWaitingText
call .PlaceWaitingText
farcall WaitLinkTransfer
call Call_ExitMenu
call WaitBGMap2
ret
.PrintWaitingText:
.PlaceWaitingText:
hlcoord 4, 10
ld b, 1
ld c, 10