Bit 7 of wJumptableIndex is often JUMPTABLE_EXIT_F (#123)

pret · Nov 30, 2024 · 201d12d · 201d12d
1 parent 3257bc1
commit 201d12d
Show file tree

Hide file tree

Showing 24 changed files with 114 additions and 110 deletions.
diff --git a/constants/ram_constants.asm b/constants/ram_constants.asm
@@ -21,6 +21,11 @@ DEF AUTO_INPUT EQU $ff
 	const TEMPMON    ; 3
 	const WILDMON    ; 4
 
+; wJumptableIndex::
+DEF JUMPTABLE_INDEX_MASK EQU %01111111
+	const_def 7
+	shift_const JUMPTABLE_EXIT
+
 ; wGameTimerPaused::
 DEF GAME_TIMER_COUNTING_F EQU 0
 

diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
@@ -4,7 +4,6 @@ DEF BATTLETRANSITION_CAVE_STRONGER    EQU $09
 DEF BATTLETRANSITION_NO_CAVE          EQU $10
 DEF BATTLETRANSITION_NO_CAVE_STRONGER EQU $18
 DEF BATTLETRANSITION_FINISH           EQU $20
-DEF BATTLETRANSITION_END              EQU $80
 
 DEF BATTLETRANSITION_SQUARE EQU "8" ; $fe
 DEF BATTLETRANSITION_BLACK  EQU "9" ; $ff
@@ -26,7 +25,7 @@ DoBattleTransition:
 
 .loop
 	ld a, [wJumptableIndex]
-	bit 7, a ; BATTLETRANSITION_END?
+	bit JUMPTABLE_EXIT_F, a
 	jr nz, .done
 	call BattleTransitionJumptable
 	call DelayFrame
@@ -197,7 +196,7 @@ StartTrainerBattle_DetermineWhichAnimation:
 
 StartTrainerBattle_Finish:
 	call ClearSprites
-	ld a, BATTLETRANSITION_END
+	ld a, JUMPTABLE_EXIT
 	ld [wJumptableIndex], a
 	ret
 

diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm
@@ -62,7 +62,7 @@ DebugColorPicker: ; unreferenced
 	ld [wDebugColorIsShiny], a
 .loop
 	ld a, [wJumptableIndex]
-	bit 7, a
+	bit JUMPTABLE_EXIT_F, a
 	jr nz, .exit
 	call DebugColorMain
 	call DebugColor_PlaceCursor
@@ -704,7 +704,7 @@ DebugColor_TMHMJoypad:
 
 .exit ; unreferenced
 	ld hl, wJumptableIndex
-	set 7, [hl]
+	set JUMPTABLE_EXIT_F, [hl]
 	ret
 
 .scroll:

diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
@@ -120,7 +120,7 @@ OWCutAnimation:
 	call PlaySFX
 .loop
 	ld a, [wJumptableIndex]
-	bit 7, a
+	bit JUMPTABLE_EXIT_F, a
 	jr nz, .finish
 	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurSpriteOAMAddr], a
@@ -208,7 +208,7 @@ Cut_WaitAnimSFX:
 
 .finished
 	ld hl, wJumptableIndex
-	set 7, [hl]
+	set JUMPTABLE_EXIT_F, [hl]
 	ret
 
 Cut_SpawnLeaf:
@@ -317,7 +317,7 @@ FlyFromAnim:
 	ld [wFrameCounter], a
 .loop
 	ld a, [wJumptableIndex]
-	bit 7, a
+	bit JUMPTABLE_EXIT_F, a
 	jr nz, .exit
 	ld a, 0 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurSpriteOAMAddr], a
@@ -354,7 +354,7 @@ FlyToAnim:
 	ld [wFrameCounter], a
 .loop
 	ld a, [wJumptableIndex]
-	bit 7, a
+	bit JUMPTABLE_EXIT_F, a
 	jr nz, .exit
 	ld a, 0 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurSpriteOAMAddr], a
@@ -423,7 +423,7 @@ FlyFunction_FrameTimer:
 
 .exit
 	ld hl, wJumptableIndex
-	set 7, [hl]
+	set JUMPTABLE_EXIT_F, [hl]
 	ret
 
 .SpawnLeaf:

diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm
@@ -34,7 +34,7 @@ MagnetTrain:
 	ld [hl], VBLANK_CUTSCENE
 .loop
 	ld a, [wJumptableIndex]
-	bit 7, a
+	bit JUMPTABLE_EXIT_F, a
 	jr nz, .done
 	callfar PlaySpriteAnimations
 	call MagnetTrain_Jumptable
@@ -366,7 +366,7 @@ MagnetTrain_Jumptable:
 	ret
 
 .TrainArrived:
-	ld a, $80
+	ld a, JUMPTABLE_EXIT
 	ld [wJumptableIndex], a
 	ld de, SFX_TRAIN_ARRIVED
 	call PlaySFX

diff --git a/engine/events/mom.asm b/engine/events/mom.asm
@@ -7,7 +7,7 @@ BankOfMom:
 	ld [wJumptableIndex], a
 .loop
 	ld a, [wJumptableIndex]
-	bit 7, a
+	bit JUMPTABLE_EXIT_F, a
 	jr nz, .done
 	call .RunJumptable
 	jr .loop
@@ -278,7 +278,7 @@ BankOfMom:
 
 .AskDST:
 	ld hl, wJumptableIndex
-	set 7, [hl]
+	set JUMPTABLE_EXIT_F, [hl]
 	ret
 
 DSTChecks: