summaryrefslogtreecommitdiff
path: root/scripts/celadonmansion5.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
committeryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
commitfb11ff7e55be56cef9234c8443614f04f2157a1e (patch)
treea6aa8d0745bd07d0b80090491b5e4b6652de4420 /scripts/celadonmansion5.asm
parent15427f532085846ab6b51719be687951a094cb6c (diff)
parent9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff)
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'scripts/celadonmansion5.asm')
-rwxr-xr-xscripts/celadonmansion5.asm5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/celadonmansion5.asm b/scripts/celadonmansion5.asm
index 1d03ae5e..66ef96d8 100755
--- a/scripts/celadonmansion5.asm
+++ b/scripts/celadonmansion5.asm
@@ -15,8 +15,7 @@ CeladonMansion5Text2: ; 1dd46 (7:5d46)
call GivePokemon
jr nc, .asm_24365 ; 0x1dd4d
ld a, $45
- ld [$cc4d], a
- ld a, $11
- call Predef
+ ld [wcc4d], a
+ predef HideObject
.asm_24365 ; 0x1dd59
jp TextScriptEnd