summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2016-01-18 00:39:01 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2016-01-18 00:39:01 -0500
commit8bf255b9f84f7e4f93e85a75512a002ef240a10f (patch)
tree786ae5588f8bfe4b067cb3e91fd66cc4d95bd2da /misc
parent7cc2571529d6b3f5ffcbb71c62fab31b27ba224a (diff)
Prepare to merge
Diffstat (limited to 'misc')
-rw-r--r--misc/mobile_40.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 1a185b1a0..8594f0044 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -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]