diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-13 11:10:03 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-13 11:10:03 -0500 |
| commit | b88572fbccecc8d125fe8a50365751f0530d1a9a (patch) | |
| tree | 46a733a0ad7259689b9b5577f109751f34f42956 /scripts/Route22.asm | |
| parent | Mention YELLMONS.GB in the readme (diff) | |
| download | pokeyellow-b88572fbccecc8d125fe8a50365751f0530d1a9a.tar.gz pokeyellow-b88572fbccecc8d125fe8a50365751f0530d1a9a.tar.xz pokeyellow-b88572fbccecc8d125fe8a50365751f0530d1a9a.zip | |
Add constants for player and rival starters
Diffstat (limited to 'scripts/Route22.asm')
| -rwxr-xr-x | scripts/Route22.asm | 8 |
1 files changed, 4 insertions, 4 deletions
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 |