diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
| commit | 5459477ecd3c60342f31881343bc921b41b94eb0 (patch) | |
| tree | aed48bfac6aee9ccad16d3de004c1014550bacd5 /scripts/route22.asm | |
| parent | 519dd7fd56c4688ead80e444d945fc188cea5b66 (diff) | |
| parent | 0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff) | |
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/route22.asm')
| -rwxr-xr-x | scripts/route22.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/route22.asm b/scripts/route22.asm index 233d42c3..9181380a 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -205,7 +205,7 @@ Route22Script3: ; 5102a (14:502a) ret nz xor a ld [wJoyIgnore], a - ld a, $22 + ld a, HS_ROUTE_22_RIVAL_1 ld [wcc4d], a predef HideObject call PlayDefaultMusic @@ -350,7 +350,7 @@ Route22Script6: ; 51151 (14:5151) ret nz xor a ld [wJoyIgnore], a - ld a, $23 + ld a, HS_ROUTE_22_RIVAL_2 ld [wcc4d], a predef HideObject call PlayDefaultMusic |