aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/4_2.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2014-09-19 23:19:05 -0400
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2014-09-19 23:19:05 -0400
commitdac95cb42bb8bc953c7a1e1d345a549846d51abf (patch)
treeb996727e4f739da761fc1fa2418c65415ebf93d8 /engine/battle/4_2.asm
parentDon't redundantly define sprite dimensions (diff)
parentMerge remote-tracking branch 'origin/master' into tentative (diff)
downloadpokeyellow-dac95cb42bb8bc953c7a1e1d345a549846d51abf.tar.gz
pokeyellow-dac95cb42bb8bc953c7a1e1d345a549846d51abf.tar.xz
pokeyellow-dac95cb42bb8bc953c7a1e1d345a549846d51abf.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'engine/battle/4_2.asm')
-rwxr-xr-xengine/battle/4_2.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm
index c5c62796..b53ea6e4 100755
--- a/engine/battle/4_2.asm
+++ b/engine/battle/4_2.asm
@@ -391,7 +391,7 @@ GetTrainerName_: ; 13a58 (4:7a58)
ld [wd0b5], a
ld a, TRAINER_NAME
ld [W_LISTTYPE], a
- ld a, $e
+ ld a, BANK(TrainerNames)
ld [wPredefBank], a
call GetName
ld hl, wcd6d