From 1c0fff7668dffccbc498bdaddfe4dcdf6fb08c7e Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 25 Aug 2018 14:34:25 -0400 Subject: hLabel - $ff00 -> LOW(hLabel) --- engine/battle/battle_transition.asm | 2 +- engine/battle/sliding_intro.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/battle') diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index af120fdd3..e4c99be6c 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -315,7 +315,7 @@ StartTrainerBattle_SetUpForWavyOutro: call StartTrainerBattle_NextScene - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a xor a ldh [hLYOverrideStart], a diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm index e002247a4..bda859cb4 100644 --- a/engine/battle/sliding_intro.asm +++ b/engine/battle/sliding_intro.asm @@ -4,7 +4,7 @@ BattleIntroSlidingPics: ld a, BANK(wLYOverrides) ldh [rSVBK], a call .subfunction1 - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a call .subfunction2 xor a -- cgit v1.2.3