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

Bit 7 of wJumptableIndex is often JUMPTABLE_EXIT_F

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/battle/battle_transition.asm
View File

@@ -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
@@ -247,7 +246,7 @@ StartTrainerBattle_DetermineWhichAnimation:
StartTrainerBattle_Finish:
call ClearSprites
ld a, BATTLETRANSITION_END
ld a, JUMPTABLE_EXIT
ld [wJumptableIndex], a
ret