From 41045d0266669c20d956797c9d056cf60a686596 Mon Sep 17 00:00:00 2001
From: Rangi42 <sylvie.oukaour+rangi42@gmail.com>
Date: Mon, 2 Dec 2024 12:00:36 -0500
Subject: [PATCH] Crystal-only jumptable exit bits

---
 engine/events/battle_tower/battle_tower.asm |  4 ++--
 engine/events/celebi.asm                    |  4 ++--
 engine/gfx/pic_animation.asm                | 12 ++++++------
 engine/overworld/map_objects.asm            |  2 +-
 engine/pokemon/stats_screen.asm             | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index da6438df7b9..162c1942c4f 100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -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:
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
index 582bb10d6a0..c7544a1e523 100644
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -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
diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm
index ba8e90fcbd2..6a284806c27 100644
--- a/engine/gfx/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -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:
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 4049cdd9f8f..7f9c6a9767c 100644
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -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
diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm
index 53027d6b88c..01926f1cb6a 100644
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -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: