diff options
| author | yenatch <yenatch@gmail.com> | 2014-05-26 14:04:56 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-05-26 22:04:39 -0700 |
| commit | 40c17c906b2b3f65b3b04b1933b90238a7ac5566 (patch) | |
| tree | 6de26c959808d5a792b692f2300c33557c1dbfab /scripts/mtmoonpokecenter.asm | |
| parent | 52ba96f5f4ec53450a0ff6257ea1040d09b7e537 (diff) | |
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>".
Label overleads are still an issue.
Diffstat (limited to 'scripts/mtmoonpokecenter.asm')
| -rwxr-xr-x | scripts/mtmoonpokecenter.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index 0b612310..e4515a61 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -23,16 +23,16 @@ MtMoonPokecenterText3: ; 492e7 (12:52e7) MtMoonPokecenterText4: ; 492ec (12:52ec) db $08 ; asm - ld a, [$d7c6] + ld a, [wd7c6] add a jp c, .asm_49353 ld hl, MtMoonPokecenterText_4935c call PrintText ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jp nz, .asm_4934e ldh [$9f], a @@ -49,18 +49,18 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) jr nc, .asm_49359 ; 0x49324 xor a ld [wWhichTrade], a - ld [$cd3f], a + ld [wTrainerFacingDirection], a ld a, $5 - ld [$cd3e], a - ld hl, $cd3f - ld de, $d349 + ld [wTrainerEngageDistance], a + ld hl, wTrainerFacingDirection + ld de, wPlayerMoney + 2 ld c, $3 ld a, $c ; SubtractBCDPredef call Predef ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID - ld hl, $d7c6 + ld hl, wd7c6 set 7, [hl] jr .asm_49359 ; 0x4934c .asm_4934e ; 0x4934e |