pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage of rIE and rSC constants

Browse Source
This commit is contained in:
mid-kid
2019-05-05 18:14:46 +02:00
parent 40766b9a76
commit 13cfe356d6
13 changed files with 77 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
home/handshake.asm
View File

@@ -32,11 +32,11 @@ AskSerial::
ldh [rSB], a
; switch to internal clock
ld a, %00000001
ld a, (0 << rSC_ON) | (1 << rSC_CLOCK)
ldh [rSC], a
; start transfer
ld a, %10000001
ld a, (1 << rSC_ON) | (1 << rSC_CLOCK)
ldh [rSC], a
ret

4
home/init.asm
View File

@@ -6,7 +6,7 @@ Reset::
call ClearPalettes
xor a
ldh [rIF], a
ld a, 1 ; VBlank int
ld a, 1 << VBLANK
ldh [rIE], a
ei
@@ -154,7 +154,7 @@ Init::
xor a
ldh [rIF], a
ld a, %1111 ; VBlank, LCDStat, Timer, Serial interrupts
ld a, IE_DEFAULT
ldh [rIE], a
ei

2
home/lcd.asm
View File

@@ -46,7 +46,7 @@ DisableLCD::
ld b, a
; Disable VBlank
res 0, a ; vblank
res VBLANK, a
ldh [rIE], a
.wait

24
home/serial.asm
View File

@@ -28,9 +28,9 @@ Serial::
cp USING_INTERNAL_CLOCK
jr z, .player2
ld a, 0 << rSC_ON
ld a, (0 << rSC_ON) | (0 << rSC_CLOCK)
ldh [rSC], a
ld a, 1 << rSC_ON
ld a, (1 << rSC_ON) | (0 << rSC_CLOCK)
ldh [rSC], a
jr .player2
@@ -65,9 +65,9 @@ Serial::
bit 7, a
jr nz, .wait_bit_7
ld a, 0 << rSC_ON
ld a, (0 << rSC_ON) | (0 << rSC_CLOCK)
ldh [rSC], a
ld a, 1 << rSC_ON
ld a, (1 << rSC_ON) | (0 << rSC_CLOCK)
ldh [rSC], a
jr .player2
@@ -130,9 +130,9 @@ Serial_ExchangeByte::
ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
jr nz, .not_player_2
ld a, (0 << rSC_ON) | 1
ld a, (0 << rSC_ON) | (1 << rSC_CLOCK)
ldh [rSC], a
ld a, (1 << rSC_ON) | 1
ld a, (1 << rSC_ON) | (1 << rSC_CLOCK)
ldh [rSC], a
.not_player_2
.loop2
@@ -352,9 +352,9 @@ LinkTransfer::
ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
jr nz, .player_1
ld a, (0 << rSC_ON) | 1
ld a, (0 << rSC_ON) | (1 << rSC_CLOCK)
ldh [rSC], a
ld a, (1 << rSC_ON) | 1
ld a, (1 << rSC_ON) | (1 << rSC_CLOCK)
ldh [rSC], a
.player_1
@@ -382,9 +382,9 @@ LinkDataReceived::
ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
ret nz
ld a, (0 << rSC_ON) | 1
ld a, (0 << rSC_ON) | (1 << rSC_CLOCK)
ldh [rSC], a
ld a, (1 << rSC_ON) | 1
ld a, (1 << rSC_ON) | (1 << rSC_CLOCK)
ldh [rSC], a
ret
@@ -396,8 +396,8 @@ Unreferenced_Function919::
ldh [rSB], a
xor a
ldh [hSerialReceive], a
ld a, 0 << rSC_ON
ld a, (0 << rSC_ON) | (0 << rSC_CLOCK)
ldh [rSC], a
ld a, 1 << rSC_ON
ld a, (1 << rSC_ON) | (0 << rSC_CLOCK)
ldh [rSC], a
ret

16
home/vblank.asm
View File

@@ -196,13 +196,13 @@ VBlank1::
xor a
ldh [rIF], a
; enable lcd stat
ld a, %10 ; lcd stat
ld a, 1 << LCD_STAT
ldh [rIE], a
; rerequest serial int if applicable (still disabled)
; request lcd stat
ld a, b
and %1000 ; serial
or %10 ; lcd stat
and 1 << SERIAL
or 1 << LCD_STAT
ldh [rIF], a
ei
@@ -220,7 +220,7 @@ VBlank1::
xor a
ldh [rIF], a
; enable ints besides joypad
ld a, %1111 ; serial timer lcdstat vblank
ld a, IE_DEFAULT
ldh [rIE], a
; rerequest ints
ld a, b
@@ -279,7 +279,7 @@ VBlank3::
push af
xor a
ldh [rIF], a
ld a, %10 ; lcd stat
ld a, 1 << LCD_STAT
ldh [rIE], a
ldh [rIF], a
@@ -302,7 +302,7 @@ VBlank3::
xor a
ldh [rIF], a
; enable ints besides joypad
ld a, %1111 ; serial timer lcdstat vblank
ld a, IE_DEFAULT
ldh [rIE], a
; request ints
ld a, b
@@ -368,7 +368,7 @@ VBlank5::
xor a
ldh [rIF], a
ld a, %10 ; lcd stat
ld a, 1 << LCD_STAT
ldh [rIE], a
; request lcd stat
ldh [rIF], a
@@ -384,7 +384,7 @@ VBlank5::
xor a
ldh [rIF], a
; enable ints besides joypad
ld a, %1111 ; serial timer lcdstat vblank
ld a, IE_DEFAULT
ldh [rIE], a
ret