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/celadonmart3.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/celadonmart3.asm')
| -rwxr-xr-x | scripts/celadonmart3.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index 969fa5f8..8874a743 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -22,7 +22,7 @@ CeladonMart3TextPointers: ; 48228 (12:4228) CeladonMart3Text1: ; 4824a (12:424a) db $08 ; asm - ld a, [$d778] + ld a, [wd778] bit 7, a jr nz, .asm_a5463 ; 0x48250 ld hl, TM18PreReceiveText @@ -30,7 +30,7 @@ CeladonMart3Text1: ; 4824a (12:424a) ld bc, (TM_18 << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, $d778 + ld hl, wd778 set 7, [hl] ld hl, ReceivedTM18Text jr .asm_81359 ; 0x48268 |