Prepare to merge

This commit is contained in:
PikalaxALT
2016-01-18 00:39:01 -05:00
parent 7cc2571529
commit 8bf255b9f8
14 changed files with 301 additions and 290 deletions

View File

@@ -2595,7 +2595,7 @@ Function10107d: ; 10107d
ld bc, NAME_LENGTH
call .CopyAllFromOT
ld hl, OTPartyMonOT
ld de, OTName + 1
ld de, OTClassName + 1
ld bc, NAME_LENGTH
call .CopyAllFromOT
ld hl, OTPartyMon1Species
@@ -4039,7 +4039,7 @@ Function1019ee: ; 1019ee
ld a, c
ld [OtherTrainerClass], a
ld hl, OTPlayerName
ld de, OTName
ld de, OTClassName
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wcd2f]