diff options
| author | JimB16 <f1@jimb.de> | 2015-10-07 20:38:24 +0200 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-07 20:38:24 +0200 |
| commit | 975efb28aec9faf9409cbf85fc636ac2e4219138 (patch) | |
| tree | c8c4ae91e4e6defecaf95af5f32c3f7e6a1073a7 /items | |
| parent | 0001c688d35d006d178ac892b1adef887a8b0796 (diff) | |
| parent | 7176eff7aafda5378305a593c459d158ac27601f (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'items')
| -rw-r--r-- | items/item_effects.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index 72bfcf617..3de289101 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -658,27 +658,27 @@ endr ld b, $0 callba Function116c1 - ld a, $1 + ld a, BANK(sBoxMonNicknames) call GetSRAMBank ld hl, wd050 - ld de, $b082 - ld bc, $000b + ld de, sBoxMonNicknames + ld bc, PKMN_NAME_LENGTH call CopyBytes - ld hl, $b082 + ld hl, sBoxMonNicknames ld de, StringBuffer1 call InitName call CloseSRAM .asm_ebaf - ld a, $1 + ld a, BANK(sBoxMonNicknames) call GetSRAMBank - ld hl, $b082 + ld hl, sBoxMonNicknames ld de, wd050 - ld bc, $000b + ld bc, PKMN_NAME_LENGTH call CopyBytes call CloseSRAM |