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/ssanne2.asm | |
| parent | Improve labels for Yellow Safari Zone entrance. (diff) | |
| parent | A few static hide/show ids (diff) | |
| download | pokeyellow-5459477ecd3c60342f31881343bc921b41b94eb0.tar.gz pokeyellow-5459477ecd3c60342f31881343bc921b41b94eb0.tar.xz pokeyellow-5459477ecd3c60342f31881343bc921b41b94eb0.zip | |
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/ssanne2.asm')
| -rwxr-xr-x | scripts/ssanne2.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index c5943a54..474aaa60 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -32,7 +32,7 @@ SSAnne2Script0: ; 613be (18:53be) call PlayMusic ld a, [wWhichTrade] ld [$ffdb], a - ld a, $71 + ld a, HS_SS_ANNE_2_RIVAL ld [wcc4d], a predef ShowObject call Delay3 @@ -160,7 +160,7 @@ SSAnne2Script3: ; 614be (18:54be) ret nz xor a ld [wJoyIgnore], a - ld a, $71 + ld a, HS_SS_ANNE_2_RIVAL ld [wcc4d], a predef HideObject call PlayDefaultMusic |