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

Update hardware.inc to 5.1.0

Browse Source
This commit is contained in:
Rangi42
2025-06-29 15:53:34 -04:00
committed by Rangi
parent 8f5a8c5b5b
commit 5abf8d01fb
84 changed files with 845 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
engine/pokegear/pokegear.asm
View File

@@ -463,10 +463,10 @@ PokegearClock_Joypad:
call .UpdateClock
ld hl, hJoyLast
ld a, [hl]
and A_BUTTON | B_BUTTON | START | SELECT
and PAD_A | PAD_B | PAD_START | PAD_SELECT
jr nz, .quit
ld a, [hl]
and D_RIGHT
and PAD_RIGHT
ret z
ld a, [wPokegearFlags]
bit POKEGEAR_MAP_CARD_F, a
@@ -570,13 +570,13 @@ PokegearMap_JohtoMap:
PokegearMap_ContinueMap:
ld hl, hJoyLast
ld a, [hl]
and B_BUTTON
and PAD_B
jr nz, .cancel
ld a, [hl]
and D_RIGHT
and PAD_RIGHT
jr nz, .right
ld a, [hl]
and D_LEFT
and PAD_LEFT
jr nz, .left
call .DPad
ret
@@ -612,10 +612,10 @@ PokegearMap_ContinueMap:
.DPad:
ld hl, hJoyLast
ld a, [hl]
and D_UP
and PAD_UP
jr nz, .up
ld a, [hl]
and D_DOWN
and PAD_DOWN
jr nz, .down
ret
@@ -753,10 +753,10 @@ PokegearRadio_Init:
PokegearRadio_Joypad:
ld hl, hJoyLast
ld a, [hl]
and B_BUTTON
and PAD_B
jr nz, .cancel
ld a, [hl]
and D_LEFT
and PAD_LEFT
jr nz, .left
ld a, [wPokegearRadioChannelAddr]
ld l, a
@@ -812,17 +812,17 @@ PokegearPhone_Init:
PokegearPhone_Joypad:
ld hl, hJoyPressed
ld a, [hl]
and B_BUTTON
and PAD_B
jr nz, .b
ld a, [hl]
and A_BUTTON
and PAD_A
jr nz, .a
ld hl, hJoyLast
ld a, [hl]
and D_LEFT
and PAD_LEFT
jr nz, .left
ld a, [hl]
and D_RIGHT
and PAD_RIGHT
jr nz, .right
call PokegearPhone_GetDPad
ret
@@ -937,7 +937,7 @@ PokegearPhone_MakePhoneCall:
PokegearPhone_FinishPhoneCall:
ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
ret z
farcall HangUp
ld a, POKEGEARSTATE_PHONEJOYPAD
@@ -949,10 +949,10 @@ PokegearPhone_FinishPhoneCall:
PokegearPhone_GetDPad:
ld hl, hJoyLast
ld a, [hl]
and D_UP
and PAD_UP
jr nz, .up
ld a, [hl]
and D_DOWN
and PAD_DOWN
jr nz, .down
ret
@@ -1141,13 +1141,13 @@ PokegearPhoneContactSubmenu:
pop de
ld hl, hJoyPressed
ld a, [hl]
and D_UP
and PAD_UP
jr nz, .d_up
ld a, [hl]
and D_DOWN
and PAD_DOWN
jr nz, .d_down
ld a, [hl]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr nz, .a_b
call DelayFrame
jr .loop
@@ -1180,7 +1180,7 @@ PokegearPhoneContactSubmenu:
ldh [hBGMapMode], a
pop hl
ldh a, [hJoyPressed]
and B_BUTTON
and PAD_B
jr nz, .Cancel
ld a, [wPokegearPhoneSubmenuCursor]
ld e, a
@@ -1378,10 +1378,10 @@ AnimateTuningKnob:
.TuningKnob:
ld hl, hJoyLast
ld a, [hl]
and D_DOWN
and PAD_DOWN
jr nz, .down
ld a, [hl]
and D_UP
and PAD_UP
jr nz, .up
ret
@@ -1831,16 +1831,16 @@ _TownMap:
call JoyTextDelay
ld hl, hJoyPressed
ld a, [hl]
and B_BUTTON
and PAD_B
ret nz
ld hl, hJoyLast
ld a, [hl]
and D_UP
and PAD_UP
jr nz, .pressed_up
ld a, [hl]
and D_DOWN
and PAD_DOWN
jr nz, .pressed_down
.loop2
push de
@@ -1932,7 +1932,7 @@ PlayRadio:
.loop
call JoyTextDelay
ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr nz, .stop
ld a, [wPokegearRadioChannelAddr]
ld l, a
@@ -2047,10 +2047,10 @@ _FlyMap:
call JoyTextDelay
ld hl, hJoyPressed
ld a, [hl]
and B_BUTTON
and PAD_B
jr nz, .pressedB
ld a, [hl]
and A_BUTTON
and PAD_A
jr nz, .pressedA
call .HandleDPad
call GetMapCursorCoordinates
@@ -2092,10 +2092,10 @@ _FlyMap:
ld d, a
ld hl, hJoyLast
ld a, [hl]
and D_UP
and PAD_UP
jr nz, .ScrollNext
ld a, [hl]
and D_DOWN
and PAD_DOWN
jr nz, .ScrollPrev
ret
@@ -2372,10 +2372,10 @@ Pokedex_GetArea:
call JoyTextDelay
ld hl, hJoyPressed
ld a, [hl]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr nz, .a_b
ldh a, [hJoypadDown]
and SELECT
and PAD_SELECT
jr nz, .select
call .LeftRightInput
call .BlinkNestIcons
@@ -2397,10 +2397,10 @@ Pokedex_GetArea:
.LeftRightInput:
ld a, [hl]
and D_LEFT
and PAD_LEFT
jr nz, .left
ld a, [hl]
and D_RIGHT
and PAD_RIGHT
jr nz, .right
ret
@@ -2833,10 +2833,10 @@ EntireFlyMap: ; unreferenced
call JoyTextDelay
ld hl, hJoyPressed
ld a, [hl]
and B_BUTTON
and PAD_B
jr nz, .pressedB
ld a, [hl]
and A_BUTTON
and PAD_A
jr nz, .pressedA
call .HandleDPad
call GetMapCursorCoordinates
@@ -2874,10 +2874,10 @@ EntireFlyMap: ; unreferenced
.HandleDPad:
ld hl, hJoyLast
ld a, [hl]
and D_DOWN | D_RIGHT
and PAD_DOWN | PAD_RIGHT
jr nz, .ScrollNext
ld a, [hl]
and D_UP | D_LEFT
and PAD_UP | PAD_LEFT
jr nz, .ScrollPrev
ret