diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-12 17:45:03 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-13 00:56:53 -0400 |
| commit | f235b94a4cf9566f950962248ef7dbdacca08d41 (patch) | |
| tree | 90df0cfb2619ccb8346b8e9d41089c1c1cae9f74 /home/serial.asm | |
| parent | ff78a288fde1c6b96bb6641319abec367d5cb582 (diff) | |
Many minor cleanups.
Diffstat (limited to 'home/serial.asm')
| -rw-r--r-- | home/serial.asm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/home/serial.asm b/home/serial.asm index f2924384..78814317 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -57,7 +57,6 @@ Serial:: bit 7, a jr nz, .wait_bit_7 - ; Cycle the serial controller ld a, (0 << rSC_ON) | (0 << rSC_CLOCK) ldh [rSC], a ld a, (1 << rSC_ON) | (0 << rSC_CLOCK) @@ -82,7 +81,7 @@ Serial:: reti Serial_ExchangeBytes:: - ld a, 1 + ld a, $1 ldh [hSerialIgnoringInitialData], a .loop ld a, [hl] @@ -121,20 +120,19 @@ Serial_ExchangeByte:: xor a ldh [hSerialReceivedNewData], a ldh a, [hSerialConnectionStatus] - cp 2 + cp USING_INTERNAL_CLOCK jr nz, .not_player_2 ld a, (0 << rSC_ON) | (1 << rSC_CLOCK) ldh [rSC], a ld a, (1 << rSC_ON) | (1 << rSC_CLOCK) ldh [rSC], a - .not_player_2 .loop2 ldh a, [hSerialReceivedNewData] and a jr nz, .reset_ffcc ldh a, [hSerialConnectionStatus] - cp 1 + cp USING_EXTERNAL_CLOCK jr nz, .not_player_1_or_wLinkTimeoutFrames_zero call CheckwLinkTimeoutFramesNonzero jr z, .not_player_1_or_wLinkTimeoutFrames_zero @@ -166,7 +164,7 @@ Serial_ExchangeByte:: ld [wce5d + 1], a jr nz, .loop2 ldh a, [hSerialConnectionStatus] - cp 1 + cp USING_EXTERNAL_CLOCK jr z, .reset_ffcc ld a, 255 @@ -256,7 +254,7 @@ Serial_ExchangeLinkMenuSelection:: inc hl ldh a, [hSerialIgnoringInitialData] and a - ld a, 0 + ld a, FALSE ldh [hSerialIgnoringInitialData], a jr nz, .asm_7f8 ld a, b |