diff options
| author | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
| commit | 3fdb8a0d8995746d5605136ece384516338489b0 (patch) | |
| tree | 214030fb5b6ec943cdcb2ba84e622fba0ad3fb8f /engine/trade2.asm | |
| parent | add constants for volatile statuses and more battle labels/commentary/constants (diff) | |
| download | pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.gz pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.xz pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.zip | |
serial/trade/misc
Diffstat (limited to 'engine/trade2.asm')
| -rwxr-xr-x | engine/trade2.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/trade2.asm b/engine/trade2.asm index b13a18b6..da199e77 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -1,8 +1,8 @@ -Func_42769: ; 42769 (10:6769) +Trade_PrintPlayerMonInfoText: ; 42769 (10:6769) hlCoord 5, 0 - ld de,OTString67E5 + ld de,Trade_MonInfoText call PlaceString - ld a,[wWhichTrade] + ld a,[wTradedPlayerMonSpecies] ld [wd11e],a predef IndexToPokedex hlCoord 9, 0 @@ -13,18 +13,18 @@ Func_42769: ; 42769 (10:6769) ld de,wcf4b call PlaceString hlCoord 8, 4 - ld de,wTrainerScreenX + ld de,wTradedPlayerMonOT call PlaceString hlCoord 8, 6 - ld de,wcd4c + ld de,wTradedPlayerMonOTID ld bc,$8205 jp PrintNumber -Func_427a7: ; 427a7 (10:67a7) +Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7) hlCoord 5, 10 - ld de,OTString67E5 + ld de,Trade_MonInfoText call PlaceString - ld a,[wTrainerEngageDistance] + ld a,[wTradedEnemyMonSpecies] ld [wd11e],a predef IndexToPokedex hlCoord 9, 10 @@ -35,14 +35,14 @@ Func_427a7: ; 427a7 (10:67a7) ld de,wcd6d call PlaceString hlCoord 8, 14 - ld de,wcd4e + ld de,wTradedEnemyMonOT call PlaceString hlCoord 8, 16 - ld de,wcd59 + ld de,wTradedEnemyMonOTID ld bc,$8205 jp PrintNumber -OTString67E5: ; 427e5 (10:67e5) +Trade_MonInfoText: ; 427e5 (10:67e5) db "──",$74,$F2,$4E db $4E db "OT/",$4E |