diff options
| -rwxr-xr-x | engine/cable_club.asm | 10 | ||||
| -rw-r--r-- | home/serial.asm | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 43900694..f1278c83 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -523,7 +523,7 @@ TradeCenter_SelectMon: ld [wCurrentMenuItem], a ld [wTradingWhichPlayerMon], a ld [wSerialExchangeNybbleSendData], a - call Serial_PrintWaitingTextAndSyncAndExchangeByte + call Serial_PrintWaitingTextAndSyncAndExchangeNybble ld a, [wSerialSyncAndExchangeNybbleReceiveData] cp $f jp z, CallCurrentTradeCenterFunction ; go back to the beginning of the trade selection menu if the other person cancelled @@ -570,7 +570,7 @@ TradeCenter_SelectMon: Coorda 1, 16 ld a, $f ld [wSerialExchangeNybbleSendData], a - call Serial_PrintWaitingTextAndSyncAndExchangeByte + call Serial_PrintWaitingTextAndSyncAndExchangeNybble ld a, [wSerialSyncAndExchangeNybbleReceiveData] cp $f ; did the other person choose Cancel too? jr nz, .cancelMenuItem_Loop @@ -733,12 +733,12 @@ TradeCenter_Trade: hlCoord 1, 14 ld de, TradeCanceled call PlaceString - call Serial_PrintWaitingTextAndSyncAndExchangeByte + call Serial_PrintWaitingTextAndSyncAndExchangeNybble jp .tradeCancelled .tradeConfirmed ld a, $2 ld [wSerialExchangeNybbleSendData], a - call Serial_PrintWaitingTextAndSyncAndExchangeByte + call Serial_PrintWaitingTextAndSyncAndExchangeNybble ld a, [wSerialSyncAndExchangeNybbleReceiveData] dec a ; did the other person cancel? jr nz, .doTrade @@ -848,7 +848,7 @@ TradeCenter_Trade: callab TryEvolvingMon call ClearScreen call LoadTrainerInfoTextBoxTiles - call Serial_PrintWaitingTextAndSyncAndExchangeByte + call Serial_PrintWaitingTextAndSyncAndExchangeNybble ld c, 40 call DelayFrames hlCoord 0, 12 diff --git a/home/serial.asm b/home/serial.asm index fa3d4c8a..86d74040 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -223,7 +223,7 @@ Serial_ExchangeLinkMenuSelection:: ; 2247 (0:2247) jr nz, .loop
ret
-Serial_PrintWaitingTextAndSyncAndExchangeByte:: ; 226e (0:226e)
+Serial_PrintWaitingTextAndSyncAndExchangeNybble:: ; 226e (0:226e)
call SaveScreenTilesToBuffer1
callab PrintWaitingText
call Serial_SyncAndExchangeNybble
@@ -269,7 +269,6 @@ Serial_SyncAndExchangeNybble:: ; 227f (0:227f) ld [wSerialSyncAndExchangeNybbleReceiveData], a
ret
-; exchange one byte with value of $f or less
Serial_ExchangeNybble:: ; 22c3 (0:22c3)
call .doExchange
ld a, [wSerialExchangeNybbleSendData]
|