Bit 7 of wJumptableIndex is often JUMPTABLE_EXIT_F

This commit is contained in:
Rangi42
2024-12-02 11:12:58 -05:00
committed by Sylvie
parent 644bd42fb0
commit e1e7cbd838
24 changed files with 114 additions and 110 deletions

View File

@@ -1033,7 +1033,7 @@ StartTitleScreen:
RunTitleScreen:
ld a, [wJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
jr nz, .done_title
call TitleScreenScene
farcall SuicuneFrameIterator
@@ -1211,7 +1211,7 @@ TitleScreenMain:
; Return to the intro sequence.
ld hl, wJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
.end
@@ -1236,7 +1236,7 @@ TitleScreenMain:
; Return to the intro sequence.
ld hl, wJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
TitleScreenEnd:
@@ -1254,7 +1254,7 @@ TitleScreenEnd:
; Back to the intro.
ld hl, wJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
DeleteSaveData:

View File

@@ -322,7 +322,7 @@ NamingScreen_ApplyTextInputMode:
NamingScreenJoypadLoop:
call JoyTextDelay
ld a, [wJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
jr nz, .quit
call .RunJumptable
farcall PlaySpriteAnimationsAndDelayFrame
@@ -444,7 +444,7 @@ NamingScreenJoypadLoop:
.end
call NamingScreen_StoreEntry
ld hl, wJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
.select
@@ -1008,7 +1008,7 @@ INCBIN "gfx/naming_screen/mail.2bpp"
.DoMailEntry:
call JoyTextDelay
ld a, [wJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
jr nz, .exit_mail
call .DoJumptable
farcall PlaySpriteAnimationsAndDelayFrame
@@ -1134,7 +1134,7 @@ INCBIN "gfx/naming_screen/mail.2bpp"
.finished
call NamingScreen_StoreEntry
ld hl, wJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
.select

View File

@@ -22,7 +22,7 @@ TrainerCard:
call UpdateTime
call JoyTextDelay
ld a, [wJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
jr nz, .quit
ldh a, [hJoyLast]
and B_BUTTON
@@ -98,7 +98,7 @@ TrainerCard_IncrementJumptable:
TrainerCard_Quit:
ld hl, wJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
TrainerCard_Page1_LoadGFX: