mirror of https://github.com/pret/pokecrystal.git
JoypadInt -> Joypad
This matches all other interrupts. The old Joypad was renamed to UpdateJoypad.
This commit is contained in:
parent
44128c5d98
commit
c0b6e5bc21
|
@ -50,7 +50,7 @@ SECTION "serial", ROM0
|
||||||
jp Serial
|
jp Serial
|
||||||
|
|
||||||
SECTION "joypad", ROM0
|
SECTION "joypad", ROM0
|
||||||
jp JoypadInt
|
jp Joypad
|
||||||
|
|
||||||
|
|
||||||
; Game Boy cartridge header
|
; Game Boy cartridge header
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
JoypadInt::
|
Joypad::
|
||||||
; Replaced by Joypad, called from VBlank instead of the useless
|
; Replaced by Joypad, called from VBlank instead of the useless
|
||||||
; joypad interrupt.
|
; joypad interrupt.
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ ClearJoypad::
|
||||||
ldh [hJoyDown], a
|
ldh [hJoyDown], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Joypad::
|
UpdateJoypad::
|
||||||
; This is called automatically every frame in VBlank.
|
; This is called automatically every frame in VBlank.
|
||||||
; Read the joypad register and translate it to something more
|
; Read the joypad register and translate it to something more
|
||||||
; workable for use in-game. There are 8 buttons, so we can use
|
; workable for use in-game. There are 8 buttons, so we can use
|
||||||
|
|
|
@ -131,7 +131,7 @@ VBlank0::
|
||||||
ld [wTextDelayFrames], a
|
ld [wTextDelayFrames], a
|
||||||
.ok2
|
.ok2
|
||||||
|
|
||||||
call Joypad
|
call UpdateJoypad
|
||||||
|
|
||||||
ld a, BANK(_UpdateSound)
|
ld a, BANK(_UpdateSound)
|
||||||
rst Bankswitch
|
rst Bankswitch
|
||||||
|
@ -325,7 +325,7 @@ VBlank4::
|
||||||
|
|
||||||
call hTransferVirtualOAM
|
call hTransferVirtualOAM
|
||||||
|
|
||||||
call Joypad
|
call UpdateJoypad
|
||||||
|
|
||||||
xor a
|
xor a
|
||||||
ld [wVBlankOccurred], a
|
ld [wVBlankOccurred], a
|
||||||
|
@ -364,7 +364,7 @@ VBlank5::
|
||||||
xor a
|
xor a
|
||||||
ld [wVBlankOccurred], a
|
ld [wVBlankOccurred], a
|
||||||
|
|
||||||
call Joypad
|
call UpdateJoypad
|
||||||
|
|
||||||
xor a
|
xor a
|
||||||
ldh [rIF], a
|
ldh [rIF], a
|
||||||
|
|
Loading…
Reference in New Issue