Fix typo in name

This commit is contained in:
YamaArashi 2015-02-07 03:04:50 -08:00
parent 3fdb8a0d89
commit 507fcbd269
2 changed files with 6 additions and 7 deletions

View file

@ -523,7 +523,7 @@ TradeCenter_SelectMon:
ld [wCurrentMenuItem], a ld [wCurrentMenuItem], a
ld [wTradingWhichPlayerMon], a ld [wTradingWhichPlayerMon], a
ld [wSerialExchangeNybbleSendData], a ld [wSerialExchangeNybbleSendData], a
call Serial_PrintWaitingTextAndSyncAndExchangeByte call Serial_PrintWaitingTextAndSyncAndExchangeNybble
ld a, [wSerialSyncAndExchangeNybbleReceiveData] ld a, [wSerialSyncAndExchangeNybbleReceiveData]
cp $f cp $f
jp z, CallCurrentTradeCenterFunction ; go back to the beginning of the trade selection menu if the other person cancelled 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 Coorda 1, 16
ld a, $f ld a, $f
ld [wSerialExchangeNybbleSendData], a ld [wSerialExchangeNybbleSendData], a
call Serial_PrintWaitingTextAndSyncAndExchangeByte call Serial_PrintWaitingTextAndSyncAndExchangeNybble
ld a, [wSerialSyncAndExchangeNybbleReceiveData] ld a, [wSerialSyncAndExchangeNybbleReceiveData]
cp $f ; did the other person choose Cancel too? cp $f ; did the other person choose Cancel too?
jr nz, .cancelMenuItem_Loop jr nz, .cancelMenuItem_Loop
@ -733,12 +733,12 @@ TradeCenter_Trade:
hlCoord 1, 14 hlCoord 1, 14
ld de, TradeCanceled ld de, TradeCanceled
call PlaceString call PlaceString
call Serial_PrintWaitingTextAndSyncAndExchangeByte call Serial_PrintWaitingTextAndSyncAndExchangeNybble
jp .tradeCancelled jp .tradeCancelled
.tradeConfirmed .tradeConfirmed
ld a, $2 ld a, $2
ld [wSerialExchangeNybbleSendData], a ld [wSerialExchangeNybbleSendData], a
call Serial_PrintWaitingTextAndSyncAndExchangeByte call Serial_PrintWaitingTextAndSyncAndExchangeNybble
ld a, [wSerialSyncAndExchangeNybbleReceiveData] ld a, [wSerialSyncAndExchangeNybbleReceiveData]
dec a ; did the other person cancel? dec a ; did the other person cancel?
jr nz, .doTrade jr nz, .doTrade
@ -848,7 +848,7 @@ TradeCenter_Trade:
callab TryEvolvingMon callab TryEvolvingMon
call ClearScreen call ClearScreen
call LoadTrainerInfoTextBoxTiles call LoadTrainerInfoTextBoxTiles
call Serial_PrintWaitingTextAndSyncAndExchangeByte call Serial_PrintWaitingTextAndSyncAndExchangeNybble
ld c, 40 ld c, 40
call DelayFrames call DelayFrames
hlCoord 0, 12 hlCoord 0, 12

View file

@ -223,7 +223,7 @@ Serial_ExchangeLinkMenuSelection:: ; 2247 (0:2247)
jr nz, .loop jr nz, .loop
ret ret
Serial_PrintWaitingTextAndSyncAndExchangeByte:: ; 226e (0:226e) Serial_PrintWaitingTextAndSyncAndExchangeNybble:: ; 226e (0:226e)
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1
callab PrintWaitingText callab PrintWaitingText
call Serial_SyncAndExchangeNybble call Serial_SyncAndExchangeNybble
@ -269,7 +269,6 @@ Serial_SyncAndExchangeNybble:: ; 227f (0:227f)
ld [wSerialSyncAndExchangeNybbleReceiveData], a ld [wSerialSyncAndExchangeNybbleReceiveData], a
ret ret
; exchange one byte with value of $f or less
Serial_ExchangeNybble:: ; 22c3 (0:22c3) Serial_ExchangeNybble:: ; 22c3 (0:22c3)
call .doExchange call .doExchange
ld a, [wSerialExchangeNybbleSendData] ld a, [wSerialExchangeNybbleSendData]