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 /engine/trade2.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 'engine/trade2.asm')
| -rwxr-xr-x | engine/trade2.asm | 60 |
1 files changed, 24 insertions, 36 deletions
diff --git a/engine/trade2.asm b/engine/trade2.asm index 9f793fac..b13a18b6 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -1,56 +1,44 @@ Func_42769: ; 42769 (10:6769) - FuncCoord 5,0 - ld hl,Coord + hlCoord 5, 0 ld de,OTString67E5 call PlaceString - ld a,[$CD3D] - ld [$D11E],a - ld a,$3A - call Predef - FuncCoord 9, 0 ; $c3a9 - ld hl,Coord - ld de,$D11E + ld a,[wWhichTrade] + ld [wd11e],a + predef IndexToPokedex + hlCoord 9, 0 + ld de,wd11e ld bc,$8103 call PrintNumber - FuncCoord 5,2 - ld hl,Coord - ld de,$CF4B + hlCoord 5, 2 + ld de,wcf4b call PlaceString - FuncCoord 8,4 - ld hl,Coord - ld de,$CD41 + hlCoord 8, 4 + ld de,wTrainerScreenX call PlaceString - FuncCoord 8, 6 ; $c420 - ld hl,Coord - ld de,$CD4C + 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,[$CD3E] - ld [$D11E],a - ld a,$3A - call Predef - FuncCoord 9, 10 ; $c471 - ld hl,Coord - ld de,$D11E + ld a,[wTrainerEngageDistance] + ld [wd11e],a + predef IndexToPokedex + hlCoord 9, 10 + ld de,wd11e ld bc,$8103 call PrintNumber - FuncCoord 5,12 - ld hl,Coord - ld de,$CD6D + hlCoord 5, 12 + ld de,wcd6d call PlaceString - FuncCoord 8,14 - ld hl,Coord - ld de,$CD4E + hlCoord 8, 14 + ld de,wcd4e call PlaceString - FuncCoord 8, 16 ; $c4e8 - ld hl,Coord - ld de,$CD59 + hlCoord 8, 16 + ld de,wcd59 ld bc,$8205 jp PrintNumber |