summaryrefslogtreecommitdiff
path: root/scripts/pewtercity.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-10-20 18:56:21 -0600
committerIIMarckus <iimarckus@gmail.com>2014-10-20 18:56:21 -0600
commit5459477ecd3c60342f31881343bc921b41b94eb0 (patch)
treeaed48bfac6aee9ccad16d3de004c1014550bacd5 /scripts/pewtercity.asm
parent519dd7fd56c4688ead80e444d945fc188cea5b66 (diff)
parent0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff)
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/pewtercity.asm')
-rwxr-xr-xscripts/pewtercity.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm
index ba32454a..55369df9 100755
--- a/scripts/pewtercity.asm
+++ b/scripts/pewtercity.asm
@@ -85,7 +85,7 @@ PewterCityScript2: ; 192d3 (6:52d3)
ld a, [wd730]
bit 0, a
ret nz
- ld a, $3
+ ld a, HS_MUSEUM_GUY
ld [wcc4d], a
predef HideObject
ld a, $3
@@ -96,7 +96,7 @@ PewterCityScript3: ; 192e9 (6:52e9)
ld a, $3
ld [wSpriteIndex], a
call SetSpritePosition2
- ld a, $3
+ ld a, HS_MUSEUM_GUY
ld [wcc4d], a
predef ShowObject
xor a
@@ -149,7 +149,7 @@ PewterCityScript5: ; 19359 (6:5359)
ld a, [wd730]
bit 0, a
ret nz
- ld a, $4
+ ld a, HS_GYM_GUY
ld [wcc4d], a
predef HideObject
ld a, $6
@@ -160,7 +160,7 @@ PewterCityScript6: ; 1936f (6:536f)
ld a, $5
ld [wSpriteIndex], a
call SetSpritePosition2
- ld a, $4
+ ld a, HS_GYM_GUY
ld [wcc4d], a
predef ShowObject
xor a