From 40c17c906b2b3f65b3b04b1933b90238a7ac5566 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 26 May 2014 14:04:56 -0700 Subject: Remove most static wram addresses. Use labels instead. For unknown addresses, use "w
". Label overleads are still an issue. --- engine/gamefreak.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engine/gamefreak.asm') diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index 4837bc18..25f0bf5a 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -85,7 +85,7 @@ AnimateShootingStar: ; 70044 (1c:4044) dec a jr nz, .asm_70098 xor a - ld [wWhichTrade], a ; $cd3d + ld [wWhichTrade], a ; wWhichTrade ld hl, PointerTable_700f2 ; $40f2 ld c, $6 .asm_700af @@ -110,15 +110,15 @@ AnimateShootingStar: ; 70044 (1c:4044) inc hl dec c jr nz, .asm_700ba - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade cp $18 jr z, .asm_700d5 add $6 - ld [wWhichTrade], a ; $cd3d + ld [wWhichTrade], a ; wWhichTrade .asm_700d5 call Func_7011f push af - ld hl, $c310 + ld hl, wOAMBuffer + $10 ld de, wOAMBuffer ld bc, $50 call CopyData @@ -173,8 +173,8 @@ OAMData_7011e: ; 7011e (1c:411e) Func_7011f: ; 7011f (1c:411f) ld b, $8 .asm_70121 - ld hl, $c35c - ld a, [wWhichTrade] ; $cd3d + ld hl, wOAMBuffer + $5c + ld a, [wWhichTrade] ; wWhichTrade ld de, $fffc ld c, a .asm_7012b -- cgit v1.3.1-sl0p