summaryrefslogtreecommitdiff
path: root/scripts/gary.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/gary.asm
parent519dd7fd56c4688ead80e444d945fc188cea5b66 (diff)
parent0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff)
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/gary.asm')
-rwxr-xr-xscripts/gary.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gary.asm b/scripts/gary.asm
index fa331152..c0785cab 100755
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@@ -120,7 +120,7 @@ GaryScript4: ; 75fe4 (1d:5fe4)
ld a, $2
ld [$ff8c], a
call MoveSprite
- ld a, $d6
+ ld a, HS_CHAMPIONS_ROOM_OAK
ld [wcc4d], a
predef ShowObject
ld a, $5
@@ -190,7 +190,7 @@ GaryScript8: ; 76083 (1d:6083)
ld a, [wd730]
bit 0, a
ret nz
- ld a, $d6
+ ld a, HS_CHAMPIONS_ROOM_OAK
ld [wcc4d], a
predef HideObject
ld a, $9