aboutsummaryrefslogtreecommitdiffstats
path: root/engine/predefs17_2.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/predefs17_2.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/predefs17_2.asm')
-rwxr-xr-xengine/predefs17_2.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/predefs17_2.asm b/engine/predefs17_2.asm
index a2dac120..c0df7d0a 100755
--- a/engine/predefs17_2.asm
+++ b/engine/predefs17_2.asm
@@ -8,8 +8,8 @@ SetPartyMonTypes: ; 5db5e (17:5b5e)
push hl
call GetMonHeader
pop hl
- ld a, [W_MONHTYPE1]
+ ld a, [wMonHType1]
ld [hli], a
- ld a, [W_MONHTYPE2]
+ ld a, [wMonHType2]
ld [hl], a
ret