From 01618d3cc46af567eea6c72ec88a2488002ca2b0 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 30 Jun 2019 14:20:25 -0400 Subject: [PATCH] Define constants for both battle transition tiles --- engine/battle/battle_transition.asm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 4df5aa808..a9dd50e4e 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -7,6 +7,7 @@ BATTLETRANSITION_FINISH EQU $20 BATTLETRANSITION_END EQU $80 BATTLETRANSITION_SQUARE EQU "8" ; $fe +BATTLETRANSITION_BLACK EQU "9" ; $ff DoBattleTransition: call .InitGFX @@ -463,7 +464,7 @@ ENDM ld c, a inc de .loop1 - ld [hl], $ff + ld [hl], BATTLETRANSITION_BLACK ld a, [wcf65] bit RIGHT_QUADRANT_F, a jr z, .leftside @@ -572,9 +573,9 @@ StartTrainerBattle_SpeckleToBlack: ; If the tile has already been blacked out, ; sample a new tile ld a, [hl] - cp $ff + cp BATTLETRANSITION_BLACK jr z, .y_loop - ld [hl], $ff + ld [hl], BATTLETRANSITION_BLACK ret StartTrainerBattle_LoadPokeBallGraphics: @@ -809,7 +810,7 @@ ENDM db -1 .Copy: - ld a, $ff + ld a, BATTLETRANSITION_BLACK .row push bc push hl