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/copycatshouse2f.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/copycatshouse2f.asm')
| -rwxr-xr-x | scripts/copycatshouse2f.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm index afe589da..ea1e91b3 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/copycatshouse2f.asm @@ -12,11 +12,11 @@ CopycatsHouse2FTextPointers: ; 5cc74 (17:4c74) CopycatsHouse2FText1: ; 5cc82 (17:4c82) db $08 ; asm - ld a, [$d7af] + ld a, [wd7af] bit 0, a jr nz, .asm_7ccf3 ; 0x5cc88 ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, CopycatsHouse2FText_5ccd4 call PrintText ld b, POKE_DOLL @@ -32,7 +32,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82) ld a, POKE_DOLL ldh [$db], a callba RemoveItemByID - ld hl, $d7af + ld hl, wd7af set 0, [hl] jr .asm_62ecd ; 0x5ccc1 .BagFull @@ -84,7 +84,7 @@ CopycatsHouse2FText6: ; 5ccfe (17:4cfe) CopycatsHouse2FText7: ; 5cd03 (17:4d03) db $08 ; asm - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 ld hl, CopycatsHouse2FText_5cd1c jr nz, .asm_399a4 ; 0x5cd0c |