aboutsummaryrefslogtreecommitdiffstats
path: root/engine/trade2.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-12-23 15:40:59 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-12-23 15:40:59 -0500
commit043e9327650f2ee0053fe43a29c9d63bc5e120d3 (patch)
tree0fe1b2d958825dfd22d921d77fe068087e164ddf /engine/trade2.asm
parentdata/pokedex_entries.asm (diff)
downloadpokeyellow-043e9327650f2ee0053fe43a29c9d63bc5e120d3.tar.gz
pokeyellow-043e9327650f2ee0053fe43a29c9d63bc5e120d3.tar.xz
pokeyellow-043e9327650f2ee0053fe43a29c9d63bc5e120d3.zip
engine/trade.asm, trade2.asm, intro.asm, overworld/emotion_bubbles.asm
Also document Func_1681 (GetFarByte) and fix Missingno's dex entry
Diffstat (limited to 'engine/trade2.asm')
-rwxr-xr-xengine/trade2.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/trade2.asm b/engine/trade2.asm
index 10bef792..a4996403 100755
--- a/engine/trade2.asm
+++ b/engine/trade2.asm
@@ -1,4 +1,4 @@
-Trade_PrintPlayerMonInfoText: ; 42769 (10:6769)
+Trade_PrintPlayerMonInfoText: ; 41be6 (10:5be6)
coord hl, 5, 0
ld de,Trade_MonInfoText
call PlaceString
@@ -20,7 +20,7 @@ Trade_PrintPlayerMonInfoText: ; 42769 (10:6769)
lb bc, LEADING_ZEROES | 2, 5
jp PrintNumber
-Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7)
+Trade_PrintEnemyMonInfoText: ; 41c24 (10:5c24)
coord hl, 5, 10
ld de,Trade_MonInfoText
call PlaceString
@@ -42,8 +42,8 @@ Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7)
lb bc, LEADING_ZEROES | 2, 5
jp PrintNumber
-Trade_MonInfoText: ; 427e5 (10:67e5)
- db "──",$74,$F2,$4E
- db $4E
- db "OT/",$4E
- db $73,"№",$F2,"@"
+Trade_MonInfoText: ; 41c62 (10:5c62)
+ db "──",$74,$F2
+ db $4e ; next
+ next "OT/"
+ next $73,"№",$F2,"@"