summaryrefslogtreecommitdiff
path: root/battle
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2016-01-04 08:46:37 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2016-01-04 08:46:37 -0500
commit27be0bfe05d161d60f977d19bee5b2812f0b5e16 (patch)
treed78c8310fd6a896914960d5831ed53514c623867 /battle
parent0add51451cda9d4221af137f83e2429d3577310c (diff)
parentc087d44c420a25dc95f61690e8d3c82932187d67 (diff)
Merge branch 'scriptmacrorenaming' of github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'battle')
-rw-r--r--battle/core.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/battle/core.asm b/battle/core.asm
index d8c38d2c1..9a464023b 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -9167,11 +9167,11 @@ GetRoamMonSpecies: ; 3fa31
Function3fa42: ; 3fa42
- ld hl, wd276
+ ld hl, OTPlayerID
ld de, StringBuffer1
ld bc, 2
call CopyBytes
- ld hl, wd26b
+ ld hl, OTPlayerName
ld bc, 10
call CopyBytes
ld hl, s1_b254