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 /engine/battle/9.asm | |
| parent | Don't hardcode wram sections (except for alignment). (diff) | |
| download | pokeyellow-40c17c906b2b3f65b3b04b1933b90238a7ac5566.tar.gz pokeyellow-40c17c906b2b3f65b3b04b1933b90238a7ac5566.tar.xz pokeyellow-40c17c906b2b3f65b3b04b1933b90238a7ac5566.zip | |
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>".
Label overleads are still an issue.
Diffstat (limited to 'engine/battle/9.asm')
| -rwxr-xr-x | engine/battle/9.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/9.asm b/engine/battle/9.asm index a2f846a2..dc72825c 100755 --- a/engine/battle/9.asm +++ b/engine/battle/9.asm @@ -28,7 +28,7 @@ asm_27d8c: ; 27d8c (9:7d8c) Func_27d98: ; 27d98 (9:7d98) call GetPredefRegisters push hl - ld a, [W_PLAYERMOVETYPE] ; $cfd5 + ld a, [W_PLAYERMOVETYPE] ; wcfd5 asm_27d9f: ; 27d9f (9:7d9f) add a ld hl, TypeNamePointers ; $7dae @@ -54,7 +54,7 @@ SaveTrainerName: ; 27e4a (9:7e4a) ld a,[hli] ld h,[hl] ld l,a - ld de,$CD6D + ld de,wcd6d .CopyCharacter ld a,[hli] ld [de],a @@ -157,11 +157,11 @@ CooltrainerFName: ; 27f79 (9:7f79) db "COOLTRAINER♀@" FocusEnergyEffect_: ; 27f86 (9:7f86) - ld hl, W_PLAYERBATTSTATUS2 ; $d063 + ld hl, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2 ld a, [H_WHOSETURN] ; $fff3 and a jr z, .asm_27f91 - ld hl, W_ENEMYBATTSTATUS2 ; $d068 + ld hl, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2 .asm_27f91 bit 2, [hl] ; is mon already using focus energy? jr nz, .asm_27fa5 |