aboutsummaryrefslogtreecommitdiffstats
path: root/engine/trade2.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /engine/trade2.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
Diffstat (limited to 'engine/trade2.asm')
-rwxr-xr-xengine/trade2.asm33
1 files changed, 16 insertions, 17 deletions
diff --git a/engine/trade2.asm b/engine/trade2.asm
index c47da36a..2c79e077 100755
--- a/engine/trade2.asm
+++ b/engine/trade2.asm
@@ -1,49 +1,48 @@
Trade_PrintPlayerMonInfoText:
coord hl, 5, 0
- ld de,Trade_MonInfoText
+ ld de, Trade_MonInfoText
call PlaceString
- ld a,[wTradedPlayerMonSpecies]
- ld [wd11e],a
+ ld a, [wTradedPlayerMonSpecies]
+ ld [wd11e], a
predef IndexToPokedex
coord hl, 9, 0
- ld de,wd11e
+ ld de, wd11e
lb bc, LEADING_ZEROES | 1, 3
call PrintNumber
coord hl, 5, 2
- ld de,wcf4b
+ ld de, wcf4b
call PlaceString
coord hl, 8, 4
- ld de,wTradedPlayerMonOT
+ ld de, wTradedPlayerMonOT
call PlaceString
coord hl, 8, 6
- ld de,wTradedPlayerMonOTID
+ ld de, wTradedPlayerMonOTID
lb bc, LEADING_ZEROES | 2, 5
jp PrintNumber
Trade_PrintEnemyMonInfoText:
coord hl, 5, 10
- ld de,Trade_MonInfoText
+ ld de, Trade_MonInfoText
call PlaceString
- ld a,[wTradedEnemyMonSpecies]
- ld [wd11e],a
+ ld a, [wTradedEnemyMonSpecies]
+ ld [wd11e], a
predef IndexToPokedex
coord hl, 9, 10
- ld de,wd11e
+ ld de, wd11e
lb bc, LEADING_ZEROES | 1, 3
call PrintNumber
coord hl, 5, 12
- ld de,wcd6d
+ ld de, wcd6d
call PlaceString
coord hl, 8, 14
- ld de,wTradedEnemyMonOT
+ ld de, wTradedEnemyMonOT
call PlaceString
coord hl, 8, 16
- ld de,wTradedEnemyMonOTID
+ ld de, wTradedEnemyMonOTID
lb bc, LEADING_ZEROES | 2, 5
jp PrintNumber
Trade_MonInfoText:
- db "──",$74,$F2
- db $4e ; next
+ db "──№⠄",$4E
next "OT/"
- next $73,"№",$F2,"@"
+ next $73,"№⠄","@"