aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/print_type.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-10-29 14:23:30 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-10-29 14:23:30 -0400
commitcb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch)
treee44bd6299c61335a9a0476db57b565aadcd0b4d7 /engine/battle/print_type.asm
parentRevert "Revert "data/facing.asm, titlescreen functions, oam/sprite related fu... (diff)
downloadpokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.gz
pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.xz
pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.zip
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'engine/battle/print_type.asm')
-rw-r--r--engine/battle/print_type.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm
index 38c701a8..0270f8b7 100644
--- a/engine/battle/print_type.asm
+++ b/engine/battle/print_type.asm
@@ -6,11 +6,11 @@ PrintMonType: ; 27d6b (9:7d6b)
call GetMonHeader
pop hl
push hl
- ld a, [W_MONHTYPE1]
+ ld a, [wMonHType1]
call PrintType
- ld a, [W_MONHTYPE1]
+ ld a, [wMonHType1]
ld b, a
- ld a, [W_MONHTYPE2]
+ ld a, [wMonHType2]
cp b
pop hl
jr z, EraseType2Text