pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Define constants for both battle transition tiles

Browse Source
This commit is contained in:
Rangi 2019-06-30 14:20:25 -04:00
parent f1bab45624
commit 01618d3cc4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/battle/battle_transition.asm
View File

@ -7,6 +7,7 @@ BATTLETRANSITION_FINISH EQU $20
BATTLETRANSITION_END EQU $80 BATTLETRANSITION_END EQU $80
BATTLETRANSITION_SQUARE EQU "8" ; $fe BATTLETRANSITION_SQUARE EQU "8" ; $fe
BATTLETRANSITION_BLACK EQU "9" ; $ff
DoBattleTransition: DoBattleTransition:
call .InitGFX call .InitGFX
@ -463,7 +464,7 @@ ENDM
ld c, a ld c, a
inc de inc de
.loop1 .loop1
ld [hl], $ff ld [hl], BATTLETRANSITION_BLACK
ld a, [wcf65] ld a, [wcf65]
bit RIGHT_QUADRANT_F, a bit RIGHT_QUADRANT_F, a
jr z, .leftside jr z, .leftside
@ -572,9 +573,9 @@ StartTrainerBattle_SpeckleToBlack:
; If the tile has already been blacked out, ; If the tile has already been blacked out,
; sample a new tile ; sample a new tile
ld a, [hl] ld a, [hl]
cp $ff cp BATTLETRANSITION_BLACK
jr z, .y_loop jr z, .y_loop
ld [hl], $ff ld [hl], BATTLETRANSITION_BLACK
ret ret
StartTrainerBattle_LoadPokeBallGraphics: StartTrainerBattle_LoadPokeBallGraphics:
@ -809,7 +810,7 @@ ENDM
db -1 db -1
.Copy: .Copy:
ld a, $ff ld a, BATTLETRANSITION_BLACK
.row .row
push bc push bc
push hl push hl