summaryrefslogtreecommitdiff
path: root/engine/move_mon.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2018-07-06 22:55:57 -0600
committerIIMarckus <iimarckus@gmail.com>2018-07-06 22:57:17 -0600
commitce0a831a597b05850d846aef28cb0292068409ea (patch)
tree9a5191131e5cd7d03f8fc3818bf6d310ded96a0d /engine/move_mon.asm
parent95c9415c46a320208160902abf0d831976efed3b (diff)
Add the three banks of common text.
Diffstat (limited to 'engine/move_mon.asm')
-rwxr-xr-xengine/move_mon.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index f6e63d88..007f3b2a 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -33,7 +33,7 @@ TryAddMonToParty:: ; d892 (3:5892)
call SkipNames
ld d, h
ld e, l
- ld hl, wPlayersName
+ ld hl, wPlayerName
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wMonType]
@@ -857,7 +857,7 @@ SentPkmnIntoBox: ; de74 (3:5e74)
jr nz, .asm_de8b
call GetBaseData
call Functiondf4d
- ld hl, wPlayersName
+ ld hl, wPlayerName
ld de, sBoxMonOT
ld bc, NAME_LENGTH
call CopyBytes
@@ -1604,7 +1604,7 @@ GivePoke: ; Give a Pokemon from script
ld a, b
and a
ret z
- ld hl, Text_WasSentToBillsPC
+ ld hl, TextJump_WasSentToBillsPC
call PrintText
ld a, BANK(sBoxMonNicknames)
call OpenSRAM
@@ -1622,8 +1622,8 @@ Functione3af: ; e3af (3:63af)
ld b, $2
ret
-Text_WasSentToBillsPC:
- text_jump Text_WasSentToBillsPC_
+TextJump_WasSentToBillsPC:
+ text_jump Text_WasSentToBillsPC
db "@"
InitNickname: ; e3b9 (3:63b9)