aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/read_trainer_party.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-16 23:27:57 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-16 23:27:57 -0500
commit40ea6a5f757bbbfdb4296e5acf644f6679a03a14 (patch)
tree2f7957bfa877ce974ad185684f037ba5b6cdfccd /engine/battle/read_trainer_party.asm
parentSwap trade center and battle center (diff)
parentMerge pull request #101 from YamaArashi/master (diff)
downloadpokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.tar.gz
pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.tar.xz
pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'engine/battle/read_trainer_party.asm')
-rwxr-xr-xengine/battle/read_trainer_party.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index e373ef93..4f72aea1 100755
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -55,8 +55,8 @@ ReadTrainer: ; 39c53 (e:5c53)
and a ; have we reached the end of the trainer data?
jr z,.FinishUp
ld [wcf91],a ; write species somewhere (XXX why?)
- ld a,1
- ld [wcc49],a
+ ld a,ENEMY_PARTY_DATA
+ ld [wMonDataLocation],a
push hl
call AddPartyMon
pop hl
@@ -72,8 +72,8 @@ ReadTrainer: ; 39c53 (e:5c53)
ld [W_CURENEMYLVL],a
ld a,[hli]
ld [wcf91],a
- ld a,1
- ld [wcc49],a
+ ld a,ENEMY_PARTY_DATA
+ ld [wMonDataLocation],a
push hl
call AddPartyMon
pop hl