aboutsummaryrefslogtreecommitdiffstats
path: root/engine/predefs17_2.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
committeryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
commitfb11ff7e55be56cef9234c8443614f04f2157a1e (patch)
treea6aa8d0745bd07d0b80090491b5e4b6652de4420 /engine/predefs17_2.asm
parentPull a lot of engine out of main.asm (diff)
parentUpdate INSTALL.md (diff)
downloadpokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.gz
pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.xz
pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.zip
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'engine/predefs17_2.asm')
-rwxr-xr-xengine/predefs17_2.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/predefs17_2.asm b/engine/predefs17_2.asm
index a1c4ff30..a2dac120 100755
--- a/engine/predefs17_2.asm
+++ b/engine/predefs17_2.asm
@@ -1,10 +1,10 @@
-; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in $d11e
+; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in wd11e
SetPartyMonTypes: ; 5db5e (17:5b5e)
- call Load16BitRegisters
- ld bc, W_PARTYMON1_TYPE1 - W_PARTYMON1DATA ; $5
+ call GetPredefRegisters
+ ld bc, wPartyMon1Type - wPartyMon1 ; $5
add hl, bc
- ld a, [$d11e]
- ld [$d0b5], a
+ ld a, [wd11e]
+ ld [wd0b5], a
push hl
call GetMonHeader
pop hl