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/ceruleancity.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/ceruleancity.asm')
| -rwxr-xr-x | scripts/ceruleancity.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 97824662..bbddad79 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -8,7 +8,7 @@ CeruleanCityScript_1948c: ; 1948c (6:548c) xor a ld [wJoyIgnore], a ld [W_CERULEANCITYCURSCRIPT], a - ld a, $5 + ld a, HS_CERULEAN_RIVAL ld [wcc4d], a predef_jump HideObject @@ -88,7 +88,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) call GetPointerWithinSpriteStateData2 ld [hl], $19 .asm_19535 - ld a, $5 + ld a, HS_CERULEAN_RIVAL ld [wcc4d], a predef ShowObject ld de, CeruleanCityMovement1 @@ -204,7 +204,7 @@ CeruleanCityScript3: ; 19610 (6:5610) ld a, [wd730] bit 0, a ret nz - ld a, $5 + ld a, HS_CERULEAN_RIVAL ld [wcc4d], a predef HideObject xor a |