diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /home/names.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'home/names.asm')
| -rw-r--r-- | home/names.asm | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/home/names.asm b/home/names.asm index 90a15c093..e9c36fc1d 100644 --- a/home/names.asm +++ b/home/names.asm @@ -1,4 +1,4 @@ -NamesPointers:: ; 33ab +NamesPointers:: ; entries correspond to GetName constants (see constants/text_constants.asm) dba PokemonNames ; MON_NAME (not used; jumps to GetPokemonName) dba MoveNames ; MOVE_NAME @@ -8,9 +8,8 @@ NamesPointers:: ; 33ab dbw 0, wOTPartyMonOT ; ENEMY_OT_NAME dba TrainerClassNames ; TRAINER_NAME dbw 4, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank) -; 33c3 -GetName:: ; 33c3 +GetName:: ; Return name wCurSpecies from name list wNamedObjectTypeBuffer in wStringBuffer1. ld a, [hROMBank] @@ -67,9 +66,8 @@ GetName:: ; 33c3 pop af rst Bankswitch ret -; 3411 -GetNthString:: ; 3411 +GetNthString:: ; Return the address of the ; ath string starting from hl. @@ -87,9 +85,8 @@ GetNthString:: ; 3411 jr nz, .readChar pop bc ret -; 3420 -GetBasePokemonName:: ; 3420 +GetBasePokemonName:: ; Discards gender (Nidoran). push hl @@ -112,9 +109,7 @@ GetBasePokemonName:: ; 3420 pop hl ret -; 343b - -GetPokemonName:: ; 343b +GetPokemonName:: ; Get Pokemon name wd265. ld a, [hROMBank] @@ -150,9 +145,8 @@ GetPokemonName:: ; 343b pop af rst Bankswitch ret -; 3468 -GetItemName:: ; 3468 +GetItemName:: ; Get item name wd265. push hl @@ -174,9 +168,8 @@ GetItemName:: ; 3468 pop bc pop hl ret -; 3487 -GetTMHMName:: ; 3487 +GetTMHMName:: ; Get TM/HM name by item id wd265. push hl @@ -257,11 +250,10 @@ GetTMHMName:: ; 3487 db "HM" .HMTextEnd: db "@" -; 34df INCLUDE "home/hm_moves.asm" -GetMoveName:: ; 34f8 +GetMoveName:: push hl ld a, MOVE_NAME @@ -275,4 +267,3 @@ GetMoveName:: ; 34f8 pop hl ret -; 350c |