diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /scripts/celadonmansion5.asm | |
| parent | Pull a lot of engine out of main.asm (diff) | |
| parent | Update INSTALL.md (diff) | |
| download | pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.gz pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.xz pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.zip | |
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-x | scripts/celadonmansion5.asm | 5 |
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 |