diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-06-30 12:47:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 12:47:22 -0400 |
| commit | 56c405de09ce267c4cfbc68a15c37b2ff51c635a (patch) | |
| tree | 47d25c237e9af824f7a57295a2d2e298b194a8e6 /home/serial.asm | |
| parent | Distinguish single trainer pics section from Pokemon pics (diff) | |
| download | pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.gz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.xz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.zip | |
Replace hardware_constants.asm with hardware.inc (#511)
Diffstat (limited to 'home/serial.asm')
| -rw-r--r-- | home/serial.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/home/serial.asm b/home/serial.asm index bfec707b..631ec70c 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -14,7 +14,7 @@ Serial:: cp USING_INTERNAL_CLOCK jr z, .done ; using external clock - ld a, START_TRANSFER_EXTERNAL_CLOCK + ld a, SC_START | SC_EXTERNAL ldh [rSC], a jr .done .connectionNotYetEstablished @@ -32,7 +32,7 @@ Serial:: ldh a, [rDIV] bit 7, a ; wait until rDIV has incremented from $3 to $80 or more jr nz, .waitLoop - ld a, START_TRANSFER_EXTERNAL_CLOCK + ld a, SC_START | SC_EXTERNAL ldh [rSC], a jr .done .usingInternalClock @@ -92,7 +92,7 @@ Serial_ExchangeByte:: ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr nz, .loop - ld a, START_TRANSFER_INTERNAL_CLOCK + ld a, SC_START | SC_INTERNAL ldh [rSC], a .loop ldh a, [hSerialReceivedNewData] @@ -117,8 +117,8 @@ Serial_ExchangeByte:: jp SetUnknownCounterToFFFF .doNotIncrementUnknownCounter ldh a, [rIE] - and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) - cp 1 << SERIAL + and IE_SERIAL | IE_TIMER | IE_STAT | IE_VBLANK + cp IE_SERIAL jr nz, .loop ld a, [wUnknownSerialCounter2] dec a @@ -139,8 +139,8 @@ Serial_ExchangeByte:: xor a ldh [hSerialReceivedNewData], a ldh a, [rIE] - and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) - sub 1 << SERIAL + and IE_SERIAL | IE_TIMER | IE_STAT | IE_VBLANK + sub IE_SERIAL jr nz, .skipReloadingUnknownCounter2 ld [wUnknownSerialCounter2], a ld a, $50 @@ -165,8 +165,8 @@ Serial_ExchangeByte:: jr z, SetUnknownCounterToFFFF .done ldh a, [rIE] - and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) - cp 1 << SERIAL + and IE_SERIAL | IE_TIMER | IE_STAT | IE_VBLANK + cp IE_SERIAL ld a, SERIAL_NO_DATA_BYTE ret z ld a, [hl] @@ -291,7 +291,7 @@ Serial_ExchangeNybble:: ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr nz, .doExchange - ld a, START_TRANSFER_INTERNAL_CLOCK + ld a, SC_START | SC_INTERNAL ldh [rSC], a .doExchange ldh a, [hSerialReceiveData] @@ -312,7 +312,7 @@ Serial_SendZeroByte:: ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK ret nz - ld a, START_TRANSFER_INTERNAL_CLOCK + ld a, SC_START | SC_INTERNAL ldh [rSC], a ret @@ -321,6 +321,6 @@ Serial_TryEstablishingExternallyClockedConnection:: ldh [rSB], a xor a ldh [hSerialReceiveData], a - ld a, START_TRANSFER_EXTERNAL_CLOCK + ld a, SC_START | SC_EXTERNAL ldh [rSC], a ret |