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/route12gateupstairs.asm | |
| parent | 15427f532085846ab6b51719be687951a094cb6c (diff) | |
| parent | 9f29f21d9d43baa7124991dcf3b093fc6c615706 (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/route12gateupstairs.asm')
| -rwxr-xr-x | scripts/route12gateupstairs.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm index 97da1b58..94a4f9a2 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/route12gateupstairs.asm @@ -8,7 +8,7 @@ Route12GateUpstairsTextPointers: ; 49563 (12:5563) Route12GateUpstairsText1: ; 49569 (12:5569) db $08 ; asm - ld a, [$d7d7] + ld a, [wd7d7] rrca jr c, .asm_0ad3c ; 0x4956e ld hl, TM39PreReceiveText @@ -18,7 +18,7 @@ Route12GateUpstairsText1: ; 49569 (12:5569) jr nc, .BagFull ld hl, ReceivedTM39Text call PrintText - ld hl, $d7d7 + ld hl, wd7d7 set 0, [hl] jr .asm_4ba56 ; 0x49589 .BagFull @@ -66,7 +66,7 @@ Route12GateUpstairsText_495c4: ; 495c4 (12:55c4) db "@" Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9) - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 jr z, .asm_495d4 ; 0x495ce $4 ld a, $1 @@ -75,5 +75,5 @@ Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9) call PrintText xor a .asm_495d8 - ld [$cc3c], a + ld [wcc3c], a jp TextScriptEnd |