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/trade2.asm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'engine/trade2.asm') diff --git a/engine/trade2.asm b/engine/trade2.asm index 9f793fac..40b86747 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -3,26 +3,26 @@ Func_42769: ; 42769 (10:6769) ld hl,Coord ld de,OTString67E5 call PlaceString - ld a,[$CD3D] - ld [$D11E],a + ld a,[wWhichTrade] + ld [wd11e],a ld a,$3A call Predef - FuncCoord 9, 0 ; $c3a9 + FuncCoord 9, 0 ld hl,Coord - ld de,$D11E + ld de,wd11e ld bc,$8103 call PrintNumber FuncCoord 5,2 ld hl,Coord - ld de,$CF4B + ld de,wcf4b call PlaceString FuncCoord 8,4 ld hl,Coord - ld de,$CD41 + ld de,wTrainerScreenX call PlaceString - FuncCoord 8, 6 ; $c420 + FuncCoord 8, 6 ld hl,Coord - ld de,$CD4C + ld de,wcd4c ld bc,$8205 jp PrintNumber @@ -31,26 +31,26 @@ Func_427a7: ; 427a7 (10:67a7) ld hl,Coord ld de,OTString67E5 call PlaceString - ld a,[$CD3E] - ld [$D11E],a + ld a,[wTrainerEngageDistance] + ld [wd11e],a ld a,$3A call Predef - FuncCoord 9, 10 ; $c471 + FuncCoord 9, 10 ld hl,Coord - ld de,$D11E + ld de,wd11e ld bc,$8103 call PrintNumber FuncCoord 5,12 ld hl,Coord - ld de,$CD6D + ld de,wcd6d call PlaceString FuncCoord 8,14 ld hl,Coord - ld de,$CD4E + ld de,wcd4e call PlaceString - FuncCoord 8, 16 ; $c4e8 + FuncCoord 8, 16 ld hl,Coord - ld de,$CD59 + ld de,wcd59 ld bc,$8205 jp PrintNumber -- cgit v1.2.3 From b36f793667924f868282ce979fabab3e95d642a5 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 13:57:26 -0700 Subject: Use macros for predef calls/jumps instead of static ids. --- engine/trade2.asm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'engine/trade2.asm') diff --git a/engine/trade2.asm b/engine/trade2.asm index 40b86747..496ce24b 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -5,8 +5,7 @@ Func_42769: ; 42769 (10:6769) call PlaceString ld a,[wWhichTrade] ld [wd11e],a - ld a,$3A - call Predef + predef IndexToPokedex FuncCoord 9, 0 ld hl,Coord ld de,wd11e @@ -33,8 +32,7 @@ Func_427a7: ; 427a7 (10:67a7) call PlaceString ld a,[wTrainerEngageDistance] ld [wd11e],a - ld a,$3A - call Predef + predef IndexToPokedex FuncCoord 9, 10 ld hl,Coord ld de,wd11e -- cgit v1.2.3 From bd533aa79bbe1998fd2b699bd7205da2de4fe55c Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Wed, 25 Jun 2014 16:58:27 -0400 Subject: Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses --- engine/trade2.asm | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'engine/trade2.asm') diff --git a/engine/trade2.asm b/engine/trade2.asm index 496ce24b..b13a18b6 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -1,53 +1,43 @@ Func_42769: ; 42769 (10:6769) - FuncCoord 5,0 - ld hl,Coord + hlCoord 5, 0 ld de,OTString67E5 call PlaceString ld a,[wWhichTrade] ld [wd11e],a predef IndexToPokedex - FuncCoord 9, 0 - ld hl,Coord + hlCoord 9, 0 ld de,wd11e ld bc,$8103 call PrintNumber - FuncCoord 5,2 - ld hl,Coord + hlCoord 5, 2 ld de,wcf4b call PlaceString - FuncCoord 8,4 - ld hl,Coord + hlCoord 8, 4 ld de,wTrainerScreenX call PlaceString - FuncCoord 8, 6 - ld hl,Coord + hlCoord 8, 6 ld de,wcd4c ld bc,$8205 jp PrintNumber Func_427a7: ; 427a7 (10:67a7) - FuncCoord 5,10 - ld hl,Coord + hlCoord 5, 10 ld de,OTString67E5 call PlaceString ld a,[wTrainerEngageDistance] ld [wd11e],a predef IndexToPokedex - FuncCoord 9, 10 - ld hl,Coord + hlCoord 9, 10 ld de,wd11e ld bc,$8103 call PrintNumber - FuncCoord 5,12 - ld hl,Coord + hlCoord 5, 12 ld de,wcd6d call PlaceString - FuncCoord 8,14 - ld hl,Coord + hlCoord 8, 14 ld de,wcd4e call PlaceString - FuncCoord 8, 16 - ld hl,Coord + hlCoord 8, 16 ld de,wcd59 ld bc,$8205 jp PrintNumber -- cgit v1.2.3