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

Crystal-only jumptable exit bits

Browse Source
This commit is contained in:
Rangi42
2024-12-02 12:00:36 -05:00
committed by Sylvie
parent e1e7cbd838
commit 41045d0266
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/events/battle_tower/battle_tower.asm
View File

@@ -605,7 +605,7 @@ Function1704e1:
.loop
call JoyTextDelay
ld a, [wJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
jr nz, .done
call .DoJumptable
farcall HDMATransferTilemapAndAttrmap_Overworld
@@ -693,7 +693,7 @@ Function1704e1:
.pressed_a_or_b
ld hl, wJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
.NextJumptableFunction:

4
engine/events/celebi.asm
View File

@@ -31,7 +31,7 @@ CelebiShrineEvent:
ld d, $0
.loop
ld a, [wJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
jr nz, .done
push bc
call GetCelebiSpriteTile
@@ -96,7 +96,7 @@ CelebiEvent_CountDown:
.done
ld hl, wJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
CelebiEvent_SpawnLeaf: ; unreferenced

12
engine/gfx/pic_animation.asm
View File

@@ -123,7 +123,7 @@ SetUpPokeAnim:
pop af
ldh [rSVBK], a
ld a, c
and $80
and JUMPTABLE_EXIT
ret z
scf
ret
@@ -196,7 +196,7 @@ PokeAnim_Idle:
PokeAnim_Play:
call PokeAnim_DoAnimScript
ld a, [wPokeAnimJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
ret z
call PokeAnim_PlaceGraphic
ld a, [wPokeAnimSceneIndex]
@@ -207,7 +207,7 @@ PokeAnim_Play:
PokeAnim_Play2:
call PokeAnim_DoAnimScript
ld a, [wPokeAnimJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
ret z
ld a, [wPokeAnimSceneIndex]
inc a
@@ -224,7 +224,7 @@ PokeAnim_BasePic:
PokeAnim_Finish:
call PokeAnim_DeinitFrames
ld hl, wPokeAnimSceneIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
PokeAnim_Cry:
@@ -358,7 +358,7 @@ PokeAnim_DoAnimScript:
ldh [hBGMapMode], a
.loop
ld a, [wPokeAnimJumptableIndex]
and $7f
and JUMPTABLE_INDEX_MASK
ld hl, .Jumptable
rst JumpTable
ret
@@ -407,7 +407,7 @@ PokeAnim_DoAnimScript:
PokeAnim_End:
ld hl, wPokeAnimJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
PokeAnim_GetDuration:

2
engine/overworld/map_objects.asm
View File

@@ -2898,7 +2898,7 @@ InitSprites:
and ~(1 << 7)
ldh [hCurSpriteTile], a
xor a
bit 7, [hl]
bit 7, [hl] ; tiles $80+ are in VRAM bank 0
jr nz, .not_vram1
or VRAM_BANK_1
.not_vram1

10
engine/pokemon/stats_screen.asm
View File

@@ -80,7 +80,7 @@ StatsScreenMain:
rst JumpTable
call StatsScreen_WaitAnim
ld a, [wJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
jr z, .loop
ret
@@ -97,14 +97,14 @@ StatsScreenMobile:
.loop
farcall Mobile_SetOverworldDelay
ld a, [wJumptableIndex]
and $7f
and JUMPTABLE_INDEX_MASK
ld hl, StatsScreenPointerTable
rst JumpTable
call StatsScreen_WaitAnim
farcall MobileComms_CheckInactivityTimer
jr c, .exit
ld a, [wJumptableIndex]
bit 7, a
bit JUMPTABLE_EXIT_F, a
jr z, .loop
.exit
@@ -142,14 +142,14 @@ StatsScreen_WaitAnim:
StatsScreen_SetJumptableIndex:
ld a, [wJumptableIndex]
and $80
and JUMPTABLE_EXIT
or h
ld [wJumptableIndex], a
ret
StatsScreen_Exit:
ld hl, wJumptableIndex
set 7, [hl]
set JUMPTABLE_EXIT_F, [hl]
ret
MonStatsInit: