diff options
| author | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2024-12-25 16:46:37 -0500 |
|---|---|---|
| committer | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2024-12-25 16:53:04 -0500 |
| commit | 47b784a4fbc7513ea6106877fbb7a54158e1b13b (patch) | |
| tree | 301a856e76abb5dcb7bcc3986ddb4bbe4f70e88e /home | |
| parent | Fix comments around battle evolution code (#120) (diff) | |
| parent | Use `SERIAL_RNS_LENGTH` in `BattleRandom` (diff) | |
| download | pokeyellow-47b784a4fbc7513ea6106877fbb7a54158e1b13b.tar.gz pokeyellow-47b784a4fbc7513ea6106877fbb7a54158e1b13b.tar.xz pokeyellow-47b784a4fbc7513ea6106877fbb7a54158e1b13b.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'home')
| -rw-r--r-- | home/serial.asm | 6 | ||||
| -rw-r--r-- | home/vcopy.asm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/home/serial.asm b/home/serial.asm index 7edba241..258651a5 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -121,7 +121,7 @@ Serial_ExchangeByte:: .doNotIncrementUnknownCounter ldh a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) - cp (1 << SERIAL) + cp 1 << SERIAL jr nz, .loop ld a, [wUnknownSerialCounter2] dec a @@ -143,7 +143,7 @@ Serial_ExchangeByte:: ldh [hSerialReceivedNewData], a ldh a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) - sub (1 << SERIAL) + sub 1 << SERIAL jr nz, .skipReloadingUnknownCounter2 ld [wUnknownSerialCounter2], a ld a, $50 @@ -169,7 +169,7 @@ Serial_ExchangeByte:: .done ldh a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) - cp (1 << SERIAL) + cp 1 << SERIAL ld a, SERIAL_NO_DATA_BYTE ret z ld a, [hl] diff --git a/home/vcopy.asm b/home/vcopy.asm index 3b26cf1d..904383ac 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -136,7 +136,7 @@ AutoBgMapTransfer:: ld h, a ldh a, [hAutoBGTransferDest] ld l, a - ld de, (12 * 32) + ld de, 12 * 32 add hl, de xor a ; TRANSFERTOP jr .doTransfer @@ -156,7 +156,7 @@ AutoBgMapTransfer:: ld h, a ldh a, [hAutoBGTransferDest] ld l, a - ld de, (6 * 32) + ld de, 6 * 32 add hl, de ld a, TRANSFERBOTTOM .doTransfer |