diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-20 12:25:55 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-20 12:25:55 -0500 |
| commit | 05382d3e3c03616d6edf21833e89a8264a8cd10a (patch) | |
| tree | df62bed28665b4c1f8e6bc54c07bd4ce8efbccea /home/names.asm | |
| parent | 8127d1fbcfccb7cd5c3e210699dd540e370b6634 (diff) | |
PARTY_LENGTH; MON_NAME; sgb_border.bin
Diffstat (limited to 'home/names.asm')
| -rw-r--r-- | home/names.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/names.asm b/home/names.asm index 9c39c0e72..37ce4f37d 100644 --- a/home/names.asm +++ b/home/names.asm @@ -1,6 +1,6 @@ NamesPointers:: ; 33ab ; entries correspond to GetName constants (see constants/text_constants.asm) - dba PokemonNames ; PKMN_NAME (not used; jumps to GetPokemonName) + dba PokemonNames ; MON_NAME (not used; jumps to GetPokemonName) dba MoveNames ; MOVE_NAME dbw 0, NULL ; DUMMY_NAME dba ItemNames ; ITEM_NAME @@ -20,13 +20,13 @@ GetName:: ; 33c3 push de ld a, [wNamedObjectTypeBuffer] - cp PKMN_NAME + cp MON_NAME jr nz, .NotPokeName ld a, [CurSpecies] ld [wd265], a call GetPokemonName - ld hl, PKMN_NAME_LENGTH + ld hl, MON_NAME_LENGTH add hl, de ld e, l ld d, h @@ -140,9 +140,9 @@ GetPokemonName:: ; 343b ; Terminator ld de, StringBuffer1 push de - ld bc, PKMN_NAME_LENGTH - 1 + ld bc, MON_NAME_LENGTH - 1 call CopyBytes - ld hl, StringBuffer1 + PKMN_NAME_LENGTH - 1 + ld hl, StringBuffer1 + MON_NAME_LENGTH - 1 ld [hl], "@" pop de |