summaryrefslogtreecommitdiff
path: root/scripts/fightingdojo.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/fightingdojo.asm
parent519dd7fd56c4688ead80e444d945fc188cea5b66 (diff)
parent0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff)
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/fightingdojo.asm')
-rwxr-xr-xscripts/fightingdojo.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm
index 4a55347e..e26da1b1 100755
--- a/scripts/fightingdojo.asm
+++ b/scripts/fightingdojo.asm
@@ -279,7 +279,7 @@ FightingDojoText6: ; 5cf06 (17:4f06)
jr nc, .done
; once Poké Ball is taken, hide sprite
- ld a, $4a
+ ld a, HS_FIGHTING_DOJO_GIFT_1
ld [wcc4d], a
predef HideObject
ld hl, wd7b1
@@ -320,7 +320,7 @@ FightingDojoText7: ; 5cf4e (17:4f4e)
set 0, [hl]
; once Poké Ball is taken, hide sprite
- ld a, $4b
+ ld a, HS_FIGHTING_DOJO_GIFT_2
ld [wcc4d], a
predef HideObject
.done