pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Apply most of pokecrystal PR 1105

Browse Source
This commit is contained in:
xCrystal
2024-02-11 00:16:00 +01:00
parent 971c4aa2c7
commit 5c4d982702
74 changed files with 276 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
engine/link/link.asm
View File

@@ -522,7 +522,7 @@ LinkTimeout:
pop de
pop hl
bccoord 1, 14
call PrintHLTextAtBC
call PrintTextboxTextAt
call RotateThreePalettesRight
call ClearScreen
ld b, CGB_DIPLOMA
@@ -1443,7 +1443,7 @@ LinkTrade_TradeStatsMenu:
dec a
ld [wCurTradePartyMon], a
ld [wPlayerLinkAction], a
farcall PrintWaitingTextAndSyncAndExchangeNybble
farcall PlaceWaitingTextAndSyncAndExchangeNybble
ld a, [wOtherPlayerLinkMode]
cp $f
jp z, InitTradeMenuDisplay
@@ -1465,7 +1465,7 @@ LinkTrade_TradeStatsMenu:
farcall Link_WaitBGMap
ld hl, .LinkTradeCantBattleText
bccoord 1, 14
call PrintHLTextAtBC
call PrintTextboxTextAt
jr .cancel_trade
.abnormal
@@ -1487,7 +1487,7 @@ LinkTrade_TradeStatsMenu:
farcall Link_WaitBGMap
ld hl, .LinkAbnormalMonText
bccoord 1, 14
call PrintHLTextAtBC
call PrintTextboxTextAt
.cancel_trade
hlcoord 0, 12
@@ -1499,7 +1499,7 @@ LinkTrade_TradeStatsMenu:
call PlaceString
ld a, $1
ld [wPlayerLinkAction], a
farcall PrintWaitingTextAndSyncAndExchangeNybble
farcall PlaceWaitingTextAndSyncAndExchangeNybble
ld c, 100
call DelayFrames
jp InitTradeMenuDisplay
@@ -1561,7 +1561,7 @@ LinkTradePartymonMenuCheckCancel:
ldcoord_a 9, 17
ld a, $f
ld [wPlayerLinkAction], a
farcall PrintWaitingTextAndSyncAndExchangeNybble
farcall PlaceWaitingTextAndSyncAndExchangeNybble
ld a, [wOtherPlayerLinkMode]
cp $f
jr nz, .loop1
@@ -1658,7 +1658,7 @@ LinkTrade:
call GetPokemonName
ld hl, LinkAskTradeForText
bccoord 1, 14
call PrintHLTextAtBC
call PrintTextboxTextAt
call LoadStandardMenuHeader
hlcoord 10, 7
ld b, 3
@@ -1707,13 +1707,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
@@ -1956,7 +1956,7 @@ LinkTrade:
ld a, b
ld [wPlayerLinkAction], a
push bc
call Serial_PrintWaitingTextAndSyncAndExchangeNybble
call Serial_PlaceWaitingTextAndSyncAndExchangeNybble
pop bc
ld a, [wLinkMode]
cp LINK_TIMECAPSULE
@@ -2020,7 +2020,7 @@ LoadTradeScreenBorderGFX:
SetTradeRoomBGPals:
farcall LoadTradeRoomBGPals ; just a nested farcall; so wasteful
call SetPalettes
call SetDefaultBGPAndOBP
ret
PlaceTradeScreenTextbox: ; unreferenced

8
engine/link/link_trade.asm
View File

@@ -27,7 +27,7 @@ TestMobileTradeBorderTilemap: ; unreferenced
farcall LoadMobileTradeBorderTilemap ; useless to farcall
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call WaitBGMap
call JoyWaitAorB
call Call_ExitMenu
@@ -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