mirror of
https://github.com/pret/poketcg.git
synced 2026-03-21 17:54:26 -05:00
hardware.inc corrections
This commit is contained in:
parent
16e04b0869
commit
d0f4073e69
|
|
@ -426,7 +426,7 @@ OpenTurnHolderHandScreen_Simple:
|
|||
ldtx hl, NoCardsInHandText
|
||||
jp DrawWideTextBox_WaitForInput
|
||||
|
||||
; triggered by pressing B + PAD_START in the duel menu
|
||||
; triggered by pressing PAD_B + PAD_START in the duel menu
|
||||
DuelMenuShortcut_OpponentActivePokemon:
|
||||
call SwapTurn
|
||||
call OpenActivePokemonScreen
|
||||
|
|
@ -3236,7 +3236,7 @@ DisplayCardList:
|
|||
ld a, [wNoItemSelectionMenuKeys]
|
||||
and b
|
||||
jr nz, .open_card_page
|
||||
; display the item selection menu (PLAY|CHECK or PAD_SELECT|CHECK) for the selected card
|
||||
; display the item selection menu (PLAY|CHECK or SELECT|CHECK) for the selected card
|
||||
; open the card page if CHECK is selected
|
||||
ldh a, [hCurMenuItem]
|
||||
call GetCardInDuelTempList_OnlyDeckIndex
|
||||
|
|
@ -3335,7 +3335,7 @@ PrintCardListHeaderAndInfoBoxTexts:
|
|||
call PrintTextNoDelay
|
||||
ret
|
||||
|
||||
; display the PAD_SELECT|CHECK or PLAY|CHECK menu when a card of a list is selected
|
||||
; display the SELECT|CHECK or PLAY|CHECK menu when a card of a list is selected
|
||||
; and handle input. return carry if b is pressed.
|
||||
; input: wCardListItemSelectionMenuType
|
||||
CardListItemSelectionMenu:
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@ HblankCopyDataHLtoDE::
|
|||
ei
|
||||
di
|
||||
ldh a, [rSTAT] ;
|
||||
and STAT_MODE ;
|
||||
and STAT_MODE ;
|
||||
jr nz, .loop ; assert hblank
|
||||
ld a, [hl]
|
||||
ld [de], a
|
||||
ldh a, [rSTAT] ;
|
||||
and STAT_MODE ;
|
||||
and STAT_MODE ;
|
||||
jr nz, .loop ; assert still in hblank
|
||||
ei
|
||||
inc hl
|
||||
|
|
@ -27,12 +27,12 @@ HblankCopyDataDEtoHL::
|
|||
ei
|
||||
di
|
||||
ldh a, [rSTAT] ;
|
||||
and STAT_MODE ;
|
||||
and STAT_MODE ;
|
||||
jr nz, .loop ; assert hblank
|
||||
ld a, [de]
|
||||
ld [hl], a
|
||||
ldh a, [rSTAT] ;
|
||||
and STAT_MODE ;
|
||||
and STAT_MODE ;
|
||||
jr nz, .loop ; assert still in hblank
|
||||
ei
|
||||
inc hl
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ DisableLCD::
|
|||
ret z ; assert that LCD is on
|
||||
ldh a, [rIE]
|
||||
ld [wIE], a
|
||||
res B_IE_VBLANK, a ;
|
||||
res B_IE_VBLANK, a ;
|
||||
ldh [rIE], a ; disable vblank interrupt
|
||||
.wait_vblank
|
||||
ldh a, [rLY] ;
|
||||
|
|
|
|||
|
|
@ -378,7 +378,7 @@ Func_0e8e::
|
|||
and ~IE_SERIAL
|
||||
ldh [rIF], a ; clear serial interrupt flag
|
||||
ldh a, [rIE]
|
||||
or IE_SERIAL ; enable serial interrupt
|
||||
or IE_SERIAL ; enable serial interrupt
|
||||
ldh [rIE], a
|
||||
ret
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ SetupTimer::
|
|||
ldh a, [rSPD]
|
||||
and SPD_DOUBLE
|
||||
jr z, .set_timer
|
||||
ld b, $100 - 2 * 68 ; Value for CGB Double Speed
|
||||
ld b, LOW(-68 * 2) ; Value for CGB Double Speed
|
||||
.set_timer
|
||||
ld a, b
|
||||
ldh [rTMA], a
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user