diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-25 19:21:49 -0400 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-25 19:21:49 -0400 |
| commit | de39851f4a06da54856b1da36edf92e3ab9fb9cc (patch) | |
| tree | 407034e78decc6bd2f2848dd8a1c46a0020b8d35 /scripts/route22.asm | |
| parent | Accidentally committed .orig files from merge dff0cdeb. (diff) | |
| download | pokeyellow-de39851f4a06da54856b1da36edf92e3ab9fb9cc.tar.gz pokeyellow-de39851f4a06da54856b1da36edf92e3ab9fb9cc.tar.xz pokeyellow-de39851f4a06da54856b1da36edf92e3ab9fb9cc.zip | |
Make Hide/Show objects more dynamic
be on the look out for more static ids in the wild
unused constants are still included because a
script could be written to check whether the player
has picked up an item/fought a legendary etc.
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 |