From b88572fbccecc8d125fe8a50365751f0530d1a9a Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 13 Nov 2020 11:10:03 -0500 Subject: Add constants for player and rival starters --- scripts/Route22.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/Route22.asm') diff --git a/scripts/Route22.asm b/scripts/Route22.asm index 5dfdc67e..4ffeff23 100755 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -148,11 +148,11 @@ Route22Script2: cp $ff jp z, Route22Script_50ece ld a, [wRivalStarter] - cp 2 - jr nz, .asm_50fc9 - ld a, $1 + cp RIVAL_STARTER_FLAREON + jr nz, .keep_rival_starter + ld a, RIVAL_STARTER_JOLTEON ld [wRivalStarter], a -.asm_50fc9 +.keep_rival_starter ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN jr nz, .notDown -- cgit v1.3.1-sl0p