Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update hardware.inc to 5.3.0 and use its new constants

Browse Source
This commit is contained in:
Rangi42
2025-08-11 16:01:32 -04:00
parent b0d56dff91
commit fcd13b1298
4 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
engine/debug/color_picker.asm
View File

@@ -945,32 +945,32 @@ _DebugColor_PushSGBPals:
ld b, a
.loop
push bc
xor a
xor a ; JOYP_SGB_START
ldh [rJOYP], a
ld a, $30
ld a, JOYP_SGB_FINISH
ldh [rJOYP], a
ld b, $10
ld b, JOYP_SGB_ONE
.loop2
ld e, $8
ld e, 8
ld a, [hli]
ld d, a
.loop3
bit 0, d
ld a, $10
ld a, JOYP_SGB_ONE
jr nz, .okay
ld a, $20
ld a, JOYP_SGB_ZERO
.okay
ldh [rJOYP], a
ld a, $30
ld a, JOYP_SGB_FINISH
ldh [rJOYP], a
rr d
dec e
jr nz, .loop3
dec b
jr nz, .loop2
ld a, $20
ld a, JOYP_SGB_ZERO
ldh [rJOYP], a
ld a, $30
ld a, JOYP_SGB_FINISH
ldh [rJOYP], a
ld de, 7000
.wait

26
engine/gfx/color.asm
View File

@@ -800,32 +800,32 @@ _PushSGBPals:
ld b, a
.loop
push bc
xor a
xor a ; JOYP_SGB_START
ldh [rJOYP], a
ld a, $30
ld a, JOYP_SGB_FINISH
ldh [rJOYP], a
ld b, $10
ld b, JOYP_SGB_ONE
.loop2
ld e, $8
ld e, 8
ld a, [hli]
ld d, a
.loop3
bit 0, d
ld a, $10
ld a, JOYP_SGB_ONE
jr nz, .okay
ld a, $20
ld a, JOYP_SGB_ZERO
.okay
ldh [rJOYP], a
ld a, $30
ld a, JOYP_SGB_FINISH
ldh [rJOYP], a
rr d
dec e
jr nz, .loop3
dec b
jr nz, .loop2
ld a, $20
ld a, JOYP_SGB_ZERO
ldh [rJOYP], a
ld a, $30
ld a, JOYP_SGB_FINISH
ldh [rJOYP], a
call SGBDelayCycles
pop bc
@@ -993,24 +993,24 @@ PushSGBBorderPalsAndWait:
and $3
cp $3
jr nz, .carry
ld a, $20
ld a, JOYP_SGB_ZERO
ldh [rJOYP], a
ldh a, [rJOYP]
ldh a, [rJOYP]
call SGBDelayCycles
call SGBDelayCycles
ld a, $30
ld a, JOYP_SGB_FINISH
ldh [rJOYP], a
call SGBDelayCycles
call SGBDelayCycles
ld a, $10
ld a, JOYP_SGB_ONE
ldh [rJOYP], a
rept 6
ldh a, [rJOYP]
endr
call SGBDelayCycles
call SGBDelayCycles
ld a, $30
ld a, JOYP_SGB_FINISH
ldh [rJOYP], a
ldh a, [rJOYP]
ldh a, [rJOYP]

2
engine/link/mystery_gift.asm
View File

@@ -1296,8 +1296,8 @@ endr
; Pressed this frame:
ld a, c
ldh [hMGJoypadPressed], a
ld a, $30
; Reset the joypad register since we're done with it.
ld a, JOYP_GET_NONE
ldh [rJOYP], a
ret