aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/get_trainer_name.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-12 00:54:49 -0700
committerGitHub <noreply@github.com>2016-06-12 00:54:49 -0700
commitbcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (patch)
tree2ffb3b9c8eca5fc4e2be2fc8aaf4965f64a13296 /engine/battle/get_trainer_name.asm
parentMerge pull request #13 from YamaArashi/master (diff)
parentmore syncing with pokered (diff)
downloadpokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.gz
pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.xz
pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.zip
Merge pull request #16 from YamaArashi/master
sync engine code with pokered
Diffstat (limited to 'engine/battle/get_trainer_name.asm')
-rw-r--r--engine/battle/get_trainer_name.asm1
1 files changed, 0 insertions, 1 deletions
diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm
index e051a02a..36ca019e 100644
--- a/engine/battle/get_trainer_name.asm
+++ b/engine/battle/get_trainer_name.asm
@@ -19,7 +19,6 @@ GetTrainerName_:
call GetName
ld hl, wcd6d
.foundName
-.rival
ld de, wTrainerName
ld bc, $d
jp CopyData