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/viridiangym.asm | |
| parent | 519dd7fd56c4688ead80e444d945fc188cea5b66 (diff) | |
| parent | 0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff) | |
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/viridiangym.asm')
| -rwxr-xr-x | scripts/viridiangym.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 3aa23b43..6ced7d82 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -175,7 +175,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) or %00000011 ld [wd752], a - ld a, $23 + ld a, HS_ROUTE_22_RIVAL_2 ld [wcc4d], a predef ShowObject ld hl, wd7eb @@ -290,7 +290,7 @@ ViridianGymText1: ; 74a69 (1d:4a69) ld hl, ViridianGymText_74ad9 call PrintText call GBFadeOutToBlack - ld a, $32 + ld a, HS_VIRIDIAN_GYM_GIOVANNI ld [wcc4d], a predef HideObject call UpdateSprites |